diff --git a/include/common.inc.php b/include/common.inc.php
index 005297d25..8aeafb7bf 100644
--- a/include/common.inc.php
+++ b/include/common.inc.php
@@ -208,6 +208,19 @@ include(
.'/themeconf.inc.php'
);
+if (is_adviser())
+{
+ ob_start();// buffer output so that cookies work
+ echo '
+
+
+
'.$lang['adviser_mode_enabled'].'
+
+
+
+ ';
+}
+
// template instance
$template = new Template(PHPWG_ROOT_PATH.'template/'.$user['template']);
?>
diff --git a/include/page_header.php b/include/page_header.php
index c807a5250..7d22e8e01 100644
--- a/include/page_header.php
+++ b/include/page_header.php
@@ -53,19 +53,9 @@ $template->assign_vars(
'DIR'=>$lang_info['direction'],
'T_STYLE' => $css,
- 'TAG_INPUT_ENABLED' => ((is_adviser()) ? 'disabled' : '')
+ 'TAG_INPUT_ENABLED' => ((is_adviser()) ? 'disabled onclick="return false;"' : '')
));
-if (is_adviser())
-{
- $template->assign_vars(
- array(
- 'ADVISER_ENABLED' => $lang['adviser_mode_enabled']
- )
- );
-}
-
-
// refresh
if ( isset( $refresh ) and intval($refresh) >= 0 and isset( $url_link ) and isset( $redirect_msg ) )
{
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index 43d63cd6a..d432d7b63 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -29,8 +29,5 @@ the "text/nonsense" prevents gecko based browsers to load it -->