// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
@@ -94,6 +94,7 @@ class AdminHome extends AdminTab
 		
 		
 		if ($rewrite + $htaccessOptimized + $smartyOptimized + $cccOptimized + $shopEnabled + $htaccessAfterUpdate + $indexRebuiltAfterUpdate != 14)
+		{
 			echo '
 			<div class="admin-box1">
 				<h5>'.$this->l('A good beginning...')
@@ -146,6 +147,8 @@ class AdminHome extends AdminTab
 					</ul>
 			</div>';
 	}
+	}
+	
 	public function display()
 	{
 		$context = Context::getContext();
@@ -159,9 +162,13 @@ class AdminHome extends AdminTab
 		<h1>'.$this->l('Dashboard').'</h1>
 		<hr style="background-color: #812143;color: #812143;" />
 		<br />';
-		if (@ini_get('allow_url_fopen') AND $update = checkPSVersion())
+		if (@ini_get('allow_url_fopen'))
+		{
+			$upgrade = new Upgrader();
+			if($update = $upgrade->checkPSVersion())
 			echo '<div class="warning warn" style="margin-bottom:30px;"><h3>'.$this->l('New PrestaShop version available').' : <a style="text-decoration: underline;" href="'.$update['link'].'" target="_blank">'.$this->l('Download').'&nbsp;'.$update['name'].'</a> !</h3></div>';
-	    elseif (!@ini_get('allow_url_fopen'))
+		}
+		else 
 	    {
 			echo '<p>'.$this->l('Update notification unavailable').'</p>';
 			echo '<p>&nbsp;</p>';