Merge remote branch 'statusnet/0.8.x' into 0.9.x

Conflicts: lib/common.php
2009-10-11 13:39:10 -04:00
parent 96d32fb8d0 006cfc528e
commit f719720e8a
9 changed files with 89 additions and 54 deletions
--- a/lib/util.php
+++ b/lib/util.php
@@ -998,7 +998,7 @@ function common_set_returnto($url)
 function common_get_returnto()
 {
    common_ensure_session();
-    return $_SESSION['returnto'];
+    return (array_key_exists('returnto', $_SESSION)) ? $_SESSION['returnto'] : null;
 }

 function common_timestamp()