From 64726aa44f0c7307150a3d89903f6d0b96bdb2ee Mon Sep 17 00:00:00 2001
From: Tom N Harris <tnharris@whoopdedo.org>
Date: Fri, 29 Oct 2010 18:33:48 -0400
Subject: Remember current page when saving configuration

---
 lib/plugins/config/admin.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/plugins/config/admin.php')

diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index 49712b73f..a628578ca 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -110,6 +110,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
         ptln('<div class="success">'.$this->getLang('updated').'</div>');
 
       ptln('<form action="'.script().'" method="post">');
+      ptln('<input type="hidden" name="id" value="'.$ID.'" />');
       formSecurityToken();
       $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki'));
 
-- 
cgit v1.2.3


From 5d85efc6906bd57ed94bd1fceb7fe09d6a795866 Mon Sep 17 00:00:00 2001
From: Adrian Lang <lang@cosmocode.de>
Date: Mon, 1 Nov 2010 10:25:35 +0100
Subject: Add comment (see #1942, f338aa80, 64726aa44)

---
 lib/plugins/config/admin.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'lib/plugins/config/admin.php')

diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php
index a628578ca..d245d3fce 100644
--- a/lib/plugins/config/admin.php
+++ b/lib/plugins/config/admin.php
@@ -109,6 +109,9 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin {
       elseif ($this->_changed)
         ptln('<div class="success">'.$this->getLang('updated').'</div>');
 
+      // POST to script() instead of wl($ID) so config manager still works if
+      // rewrite config is broken. Add $ID as hidden field to remember
+      // current ID in most cases.
       ptln('<form action="'.script().'" method="post">');
       ptln('<input type="hidden" name="id" value="'.$ID.'" />');
       formSecurityToken();
-- 
cgit v1.2.3