diff --git a/htdocs/admin/system/about.php b/htdocs/admin/system/about.php
index bb6e2372b47..61780d51386 100644
--- a/htdocs/admin/system/about.php
+++ b/htdocs/admin/system/about.php
@@ -26,16 +26,13 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
-require_once DOL_DOCUMENT_ROOT . '/core/lib/files.lib.php';
-require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin");
$langs->load("help");
$langs->load("members");
$langs->load("other");
-$youuselaststable = 0;
-
$action=GETPOST('action','alpha');
if (! $user->admin) accessforbidden();
@@ -48,12 +45,7 @@ $version='0.0';
* Actions
*/
-if ($action == 'getlastversion')
-{
- $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
- //var_dump($result['content']);
- $sfurl = simplexml_load_string($result['content']);
-}
+// None
/*
@@ -196,25 +188,29 @@ print '';
print '
';
-if ($youuselaststable)
+$showpromotemessage=1;
+if ($showpromotemessage)
{
- print '
';
- print '
';
-
$tmp=versiondolibarrarray();
- if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+ if (is_numeric($tmp[2])) // Not alpha, beta or rc
{
- print $langs->trans("TitleExampleForMajorRelease").':
';
- print '';
- }
- else
- {
- print $langs->trans("TitleExampleForMaintenanceRelease").':
';
- print '';
+ print '
';
+ print '
';
+
+ if ((empty($tmp[2]) && (strpos($tmp[1], '0') === 0)) || (strpos($tmp[2], '0') === 0))
+ {
+ print $langs->trans("TitleExampleForMajorRelease").':
';
+ print '';
+ }
+ else
+ {
+ print $langs->trans("TitleExampleForMaintenanceRelease").':
';
+ print '';
+ }
}
}
diff --git a/htdocs/admin/system/dolibarr.php b/htdocs/admin/system/dolibarr.php
index baabd8f630d..6a5384da69a 100644
--- a/htdocs/admin/system/dolibarr.php
+++ b/htdocs/admin/system/dolibarr.php
@@ -25,15 +25,36 @@
require '../../main.inc.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/memory.lib.php';
require_once DOL_DOCUMENT_ROOT.'/core/lib/date.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/geturl.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/admin.lib.php';
+require_once DOL_DOCUMENT_ROOT.'/core/lib/files.lib.php';
$langs->load("admin");
$langs->load("install");
$langs->load("other");
+$action=GETPOST('action','alpha');
+
if (! $user->admin)
accessforbidden();
+$sfurl = '';
+$version='0.0';
+
+
+/*
+ * Actions
+ */
+
+if ($action == 'getlastversion')
+{
+ $result = getURLContent('http://sourceforge.net/projects/dolibarr/rss');
+ //var_dump($result['content']);
+ $sfurl = simplexml_load_string($result['content']);
+}
+
+
/*
* View
*/