diff --git a/htdocs/main.inc.php b/htdocs/main.inc.php
index ff02c021eab..c0176ca0976 100644
--- a/htdocs/main.inc.php
+++ b/htdocs/main.inc.php
@@ -25,7 +25,7 @@
* \file htdocs/main.inc.php
* \ingroup core
* \brief File that defines environment for Dolibarr pages only (variables not required by scripts)
- * \version $Id: main.inc.php,v 1.762 2011/08/17 09:51:39 cdelambert Exp $
+ * \version $Id: main.inc.php,v 1.763 2011/08/17 19:26:48 eldy Exp $
*/
@ini_set('memory_limit', '64M'); // This may be useless if memory is hard limited by your PHP
@@ -137,31 +137,6 @@ session_start();
// This include will set: $conf, $db, $langs, $user, $mysoc objects
require_once("master.inc.php");
-// Activate error interceptions
-/*
-function processError($code, $message, $file, $line, $context)
-{
- $errmess='ERROR '.$file.' - '.$line.' - '.error_reporting()." - ".$code."
\n";
- //print $errmess;
- if (error_reporting() & $code) {
- print $errmess;
- throw new Exception($message, $code);
- }
-}
-set_error_handler('processError');
-*/
-
-// GET and POST converter
-/*
-foreach($_REQUEST as $key => $value)
-{
- // For prevent conflict
- $var = '__'.$key;
- // Create variable with tested value
- $$var = GETPOST($key);
-}
-*/
-
// Activate end of page function
register_shutdown_function('dol_shutdown');
@@ -1227,9 +1202,13 @@ function top_menu($head, $title='', $target='', $disablejs=0, $disablehead=0, $a
if (! empty($conf->browser->phone)) $loginhtmltext.='
'.$langs->trans("Phone").': '.$conf->browser->phone;
if (! empty($_SESSION["disablemodules"])) $loginhtmltext.='
'.$langs->trans("DisabledModules").':
'.join(', ',explode(',',$_SESSION["disablemodules"]));
+ $appli='Dolibarr';
+ if (!empty($conf->global->MAIN_APPLICATION_TITLE)) $appli=$conf->global->MAIN_APPLICATION_TITLE;
+
// Link info
- $logouthtmltext=''; $logouttext='';
- $logouthtmltext=$langs->trans("Logout").'
';
+ $logouttext='';
+ $logouthtmltext=$appli.' '.DOL_VERSION.'
';
+ $logouthtmltext.=$langs->trans("Logout").'
';
//$logouthtmltext.="
";
if ($_SESSION["dol_authmode"] != 'forceuser'
&& $_SESSION["dol_authmode"] != 'http')