diff options
| author | Anika Henke <anika@selfthinker.org> | 2010-06-26 13:58:21 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2010-06-26 13:58:21 +0100 |
| commit | c9f1352e1c9466db1280be9b85f77ef0da6f86f1 (patch) | |
| tree | 394a90ef919effa9282d45580850e11cb622179f | |
| parent | 2b2693ccbd870382d9b02623a4bffa6849cf70d4 (diff) | |
| parent | f338aa804b93f9b32cb861ab64827eae545f6725 (diff) | |
| download | rpg-c9f1352e1c9466db1280be9b85f77ef0da6f86f1.tar.gz rpg-c9f1352e1c9466db1280be9b85f77ef0da6f86f1.tar.bz2 | |
Merge branch 'master' of github.com:splitbrain/dokuwiki
| -rw-r--r-- | inc/common.php | 11 | ||||
| -rw-r--r-- | lib/plugins/config/admin.php | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/inc/common.php b/inc/common.php index 25d743e0b..1db362f08 100644 --- a/inc/common.php +++ b/inc/common.php @@ -1475,6 +1475,17 @@ function send_redirect($url){ // always close the session session_write_close(); + // work around IE bug + // http://www.ianhoar.com/2008/11/16/internet-explorer-6-and-redirected-anchor-links/ + list($url,$hash) = explode('#',$url); + if($hash){ + if(strpos($url,'?')){ + $url = $url.'&#'.$hash; + }else{ + $url = $url.'?&#'.$hash; + } + } + // check if running on IIS < 6 with CGI-PHP if( isset($_SERVER['SERVER_SOFTWARE']) && isset($_SERVER['GATEWAY_INTERFACE']) && (strpos($_SERVER['GATEWAY_INTERFACE'],'CGI') !== false) && diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 7cc2918f4..49712b73f 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -109,7 +109,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { elseif ($this->_changed) ptln('<div class="success">'.$this->getLang('updated').'</div>'); - ptln('<form action="'.wl($ID).'" method="post">'); + ptln('<form action="'.script().'" method="post">'); formSecurityToken(); $this->_print_h1('dokuwiki_settings', $this->getLang('_header_dokuwiki')); |