// Merge -> revision 9124

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9125 b9a71923-0436-4b27-9f14-aed3839534dd
2011-10-07 09:54:43 +00:00
parent 38a23cf978
commit 14542fea44
56 changed files with 1682 additions and 1656 deletions
@@ -269,6 +269,7 @@ class AdminSelfUpgrade extends AdminSelfTab
 	{
 		$allowed = (ConfigurationTest::test_fopen() && $this->rootWritable);
 		$allowed &= !Configuration::get('PS_SHOP_ENABLE');
+		$allowed &= $this->upgrader->autoupgrade;
 		$allowed &= (Configuration::get('PS_AUTOUP_KEEP_TRAD') !== false);

 		return $allowed;