diff options
| author | Satoshi Sahara <sahara.satoshi@gmail.com> | 2020-02-19 14:51:56 +0900 |
|---|---|---|
| committer | Satoshi Sahara <sahara.satoshi@gmail.com> | 2020-02-19 14:51:56 +0900 |
| commit | a72f333f8ea7591757bd239be842cb9d7f58923a (patch) | |
| tree | c979d099d931c387881fc2bbd266b936bdfe4e8d | |
| parent | b0b7d1963ca05dd626208139d78263cf0f7caec9 (diff) | |
| download | dokuwiki-a72f333f8ea7591757bd239be842cb9d7f58923a.tar.gz dokuwiki-a72f333f8ea7591757bd239be842cb9d7f58923a.zip | |
fix url parameter separator in gui::tabURL()
| -rw-r--r-- | lib/plugins/extension/admin.php | 16 | ||||
| -rw-r--r-- | lib/plugins/extension/helper/gui.php | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/lib/plugins/extension/admin.php b/lib/plugins/extension/admin.php index bafce49bd..ded688a9b 100644 --- a/lib/plugins/extension/admin.php +++ b/lib/plugins/extension/admin.php @@ -52,7 +52,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin $repository = $this->loadHelper('extension_repository'); if (!$repository->hasAccess(!$INPUT->bool('purge'))) { - $url = $this->gui->tabURL('', array('purge' => 1)); + $url = $this->gui->tabURL('', ['purge' => 1], '&'); msg($this->getLang('repo_error'). ' [<a href="'.$url.'">'.$this->getLang('repo_retry').'</a>]', -1 ); @@ -125,7 +125,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin } } } - send_redirect($this->gui->tabURL('', array(), '&', true)); + send_redirect($this->gui->tabURL('', [], '&', true)); } elseif ($INPUT->post->str('installurl') && checkSecurityToken()) { $installed = $extension->installFromURL($INPUT->post->str('installurl')); foreach ($installed as $ext => $info) { @@ -134,7 +134,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin $info['base']), 1 ); } - send_redirect($this->gui->tabURL('', array(), '&', true)); + send_redirect($this->gui->tabURL('', [], '&', true)); } elseif (isset($_FILES['installfile']) && checkSecurityToken()) { $installed = $extension->installFromUpload('installfile'); foreach ($installed as $ext => $info) { @@ -143,11 +143,11 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin $info['base']), 1 ); } - send_redirect($this->gui->tabURL('', array(), '&', true)); + send_redirect($this->gui->tabURL('', [], '&', true)); } } catch (Exception $e) { msg($e->getMessage(), -1); - send_redirect($this->gui->tabURL('', array(), '&', true)); + send_redirect($this->gui->tabURL('', [], '&', true)); } } @@ -156,8 +156,8 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin */ public function html() { - ptln('<h1>'.$this->getLang('menu').'</h1>'); - ptln('<div id="extension__manager">'); + echo '<h1>'.$this->getLang('menu').'</h1>'.DOKU_LF; + echo '<div id="extension__manager">'.DOKU_LF; $this->gui->tabNavigation(); @@ -176,7 +176,7 @@ class admin_plugin_extension extends DokuWiki_Admin_Plugin $this->gui->tabPlugins(); } - ptln('</div>'); + echo '</div>'.DOKU_LF; } } diff --git a/lib/plugins/extension/helper/gui.php b/lib/plugins/extension/helper/gui.php index eed80869b..d02c02a89 100644 --- a/lib/plugins/extension/helper/gui.php +++ b/lib/plugins/extension/helper/gui.php @@ -215,7 +215,7 @@ class helper_plugin_extension_gui extends DokuWiki_Plugin * @param bool $absolute create absolute URLs? * @return string */ - public function tabURL($tab = '', $params = [], $sep = '&', $absolute = false) + public function tabURL($tab = '', $params = [], $sep = '&', $absolute = false) { global $ID; global $INPUT; |