Closes #1137: Setting a hidden variable "returntoreferer" in a login form will now...

git-svn-id: https://code.elgg.org/elgg/trunk@3411 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/actions/login.php b/actions/login.php
index d937dc2f764d3b6146d6a964965b3d2c83ebacd3..99a1bb54d76c2b1424b24435fb969717edbf126c 100644 (file)
--- a/actions/login.php
+++ b/actions/login.php
@@ -50,7 +50,9 @@
                        datalist_set('first_admin_login', time());
                        
                        forward('pg/admin/plugins');
-               } else  
+               } else if (get_input('returntoreferer')) {
+                       forward($_SERVER['HTTP_REFERER']);
+               } else
                        forward("pg/dashboard/");
             }\r
         } else {\r

diff --git a/version.php b/version.php
index a933b15c95ebe9b31ee44c3bbc883a6b1f71795c..2dd83b0d037e4c44a5546bb687f68551ad63759f 100644 (file)
--- a/version.php
+++ b/version.php
@@ -13,7 +13,7 @@
         * @link http://elgg.org/\r
         */\r
 
-          $version = 2009071701;  // YYYYMMDD   = Elgg Date
+          $version = 2009072201;  // YYYYMMDD   = Elgg Date
                                   //         XX = Interim incrementer\r
        \r
           $release = '1.5';    // Human-friendly version name\r