diff options
| author | Anika Henke <anika@selfthinker.org> | 2010-11-07 09:55:17 +0000 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2010-11-07 09:55:17 +0000 |
| commit | 23b10d5bcbfb9a11561296670425bc22665fb84c (patch) | |
| tree | 745e07587c4f3feab0d56b9f9e1ed911b75511cc /lib/plugins/config | |
| parent | f5baf821ee5f6ab5b009bb94aff6f43f686d3329 (diff) | |
| parent | 9c1c56fd8f997025e879c7a36f6d3c5022b925ae (diff) | |
| download | rpg-23b10d5bcbfb9a11561296670425bc22665fb84c.tar.gz rpg-23b10d5bcbfb9a11561296670425bc22665fb84c.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
Diffstat (limited to 'lib/plugins/config')
| -rw-r--r-- | lib/plugins/config/admin.php | 4 | ||||
| -rw-r--r-- | lib/plugins/config/lang/zh/lang.php | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 49712b73f..d245d3fce 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -109,7 +109,11 @@ 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(); $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki')); diff --git a/lib/plugins/config/lang/zh/lang.php b/lib/plugins/config/lang/zh/lang.php index 6345451d5..0419968c7 100644 --- a/lib/plugins/config/lang/zh/lang.php +++ b/lib/plugins/config/lang/zh/lang.php @@ -10,6 +10,7 @@ * @author mr.jinyi@gmail.com * @author ben <ben@livetom.com> * @author lainme <lainme993@gmail.com> + * @author caii <zhoucaiqi@gmail.com> */ $lang['menu'] = '配置设置'; $lang['error'] = '由于非法参数，设置没有更新。请检查您做的改动并重新提交。 @@ -115,7 +116,7 @@ $lang['jpg_quality'] = 'JPG 压缩质量（0-100）'; $lang['subscribers'] = '启用页面订阅支持'; $lang['subscribe_time'] = '订阅列表和摘要发送的时间间隔（秒）；这应当小于指定的最近更改保留时间（recent_days）。 '; -$lang['compress'] = '使 CSS 和 javascript 输出更紧密'; +$lang['compress'] = '使 CSS 和 javascript 的输出更紧密'; $lang['hidepages'] = '隐藏匹配的界面（正则表达式）'; $lang['send404'] = '发送 "HTTP 404/页面没有找到" 错误信息给不存在的页面'; $lang['sitemap'] = '生成 Google sitemap（天）'; |