diff options
| -rw-r--r-- | inc/actions.php | 2 | ||||
| -rw-r--r-- | inc/html.php | 4 | ||||
| -rw-r--r-- | inc/template.php | 4 | ||||
| -rw-r--r-- | inc/toolbar.php | 4 | ||||
| -rw-r--r-- | lib/plugins/config/admin.php | 2 | ||||
| -rw-r--r-- | lib/plugins/plugin/admin.php | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/inc/actions.php b/inc/actions.php index 51fb0a84a..cbbbeead6 100644 --- a/inc/actions.php +++ b/inc/actions.php @@ -113,7 +113,7 @@ function act_dispatch(){ //call template FIXME: all needed vars available? $headers[] = 'Content-Type: text/html; charset=utf-8'; - trigger_event('ACTION_HEADERS_SEND',$headers,act_sendheaders); + trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders'); include(template('main.php')); // output for the commands is now handled in inc/templates.php diff --git a/inc/html.php b/inc/html.php index 7f5050b8d..8906491ef 100644 --- a/inc/html.php +++ b/inc/html.php @@ -371,7 +371,7 @@ function html_search(){ if(count($data)){ sort($data); print '<div class="search_quickresult">'; - print '<h3>'.$lang[quickhits].':</h3>'; + print '<h3>'.$lang['quickhits'].':</h3>'; print '<ul class="search_quickhits">'; foreach($data as $id){ print '<li> '; @@ -1201,7 +1201,7 @@ function html_admin(){ ); } - usort($menu, p_sort_modes); + usort($menu, 'p_sort_modes'); // output the menu ptln('<ul>'); diff --git a/inc/template.php b/inc/template.php index f9e69d340..f14472181 100644 --- a/inc/template.php +++ b/inc/template.php @@ -42,11 +42,11 @@ function tpl_content() { ob_start(); - trigger_event('TPL_ACT_RENDER',$ACT,tpl_content_core); + trigger_event('TPL_ACT_RENDER',$ACT,'tpl_content_core'); $html_output = ob_get_clean(); - trigger_event('TPL_CONTENT_DISPLAY',$html_output,ptln); + trigger_event('TPL_CONTENT_DISPLAY',$html_output,'ptln'); } function tpl_content_core(){ diff --git a/inc/toolbar.php b/inc/toolbar.php index 072b6f420..3cd58e5c6 100644 --- a/inc/toolbar.php +++ b/inc/toolbar.php @@ -186,8 +186,8 @@ function toolbar_signature(){ $sig = $conf['signature']; $sig = strftime($sig); $sig = str_replace('@USER@',$_SERVER['REMOTE_USER'],$sig); - $sig = str_replace('@NAME@',$_SESSION[$conf[title]]['auth']['info']['name'],$sig); - $sig = str_replace('@MAIL@',$_SESSION[$conf[title]]['auth']['info']['mail'],$sig); + $sig = str_replace('@NAME@',$_SESSION[$conf['title']]['auth']['info']['name'],$sig); + $sig = str_replace('@MAIL@',$_SESSION[$conf['title']]['auth']['info']['mail'],$sig); $sig = str_replace('@DATE@',date($conf['dformat']),$sig); $sig = str_replace('\\\\n','\\n',addslashes($sig)); return $sig; diff --git a/lib/plugins/config/admin.php b/lib/plugins/config/admin.php index 649318ef9..401ab6b47 100644 --- a/lib/plugins/config/admin.php +++ b/lib/plugins/config/admin.php @@ -249,7 +249,7 @@ class admin_plugin_config extends DokuWiki_Admin_Plugin { function _setup_localised_plugin_prompts() { global $conf; - $langfile = '/lang/'.$conf[lang].'/settings.php'; + $langfile = '/lang/'.$conf['lang'].'/settings.php'; $enlangfile = '/lang/en/settings.php'; if ($dh = opendir(DOKU_PLUGIN)) { diff --git a/lib/plugins/plugin/admin.php b/lib/plugins/plugin/admin.php index a69961c65..b4c9361b1 100644 --- a/lib/plugins/plugin/admin.php +++ b/lib/plugins/plugin/admin.php @@ -452,7 +452,7 @@ class ap_manage { if (!$this->manager->plugin) { return; } $component_list = ap_plugin_components($this->manager->plugin); - usort($component_list, ap_component_sort); + usort($component_list, 'ap_component_sort'); foreach ($component_list as $component) { if ($obj = & plugin_load($component['type'],$component['name']) === NULL) continue; |