Merge pull request #2550 from splitbrain/wl-redirect-consistency

unify send_redirect(wl()) parameters
dokuwiki · Jan 9, 2019 · ee73f09 · ee73f09
2 parents 0da6f92 + 2eb1177
commit ee73f09
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/inc/Action/Logout.php b/inc/Action/Logout.php
@@ -41,7 +41,7 @@ public function preProcess() {
 
         // do the logout stuff and redirect to login
         auth_logoff();
-        send_redirect(wl($ID, array('do' => 'login')));
+        send_redirect(wl($ID, array('do' => 'login'), true, '&'));
 
         // should never be reached
         throw new ActionException('login');

diff --git a/inc/Action/Redirect.php b/inc/Action/Redirect.php
@@ -55,7 +55,7 @@ public function preProcess() {
      * @param array $opts id and fragment for the redirect and the preact
      */
     public function redirect($opts) {
-        $go = wl($opts['id'], '', true);
+        $go = wl($opts['id'], '', true, '&');
         if(isset($opts['fragment'])) $go .= '#' . $opts['fragment'];
 
         //show it

diff --git a/inc/pageutils.php b/inc/pageutils.php
@@ -86,7 +86,7 @@ function getID($param='id',$clean=true){
             if (isset($urlParameters['id'])) {
                 unset($urlParameters['id']);
             }
-            send_redirect(wl($id,$urlParameters,true));
+            send_redirect(wl($id, $urlParameters, true, '&'));
         }
     }
 

diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
@@ -74,7 +74,7 @@ public function handle() {
             // save state & force a page reload to get the new settings to take effect
             $_SESSION['PLUGIN_CONFIG'] = array('state' => 'updated', 'time' => time());
             $this->_close_session();
-            send_redirect(wl($ID,array('do'=>'admin','page'=>'config'),true,'&'));
+            send_redirect(wl($ID, array('do'=>'admin','page'=>'config'), true, '&'));
             exit();
         } elseif(!$this->_error) {
             $this->_config->touch_settings(); // just touch to refresh cache