dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// MERGE with 1.4 r7770

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-07-28 09:20:57 +00:00
parent df255f66c1
commit a875fecb20
968 changed files with 26082 additions and 3937 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/tabs/AdminThemes.php
+4 -2
View File
@@ -34,13 +34,13 @@ class AdminThemes extends AdminPreferences
* @since 1.4.0.11, check theme compatibility 1.4
* @static
*/
static public $check_features_version = '1.4';
public static $check_features_version = '1.4';
/** $check_features is a multidimensional array used to check [theme]/config.xml values,
* and also checks prestashop current configuration if not match.
* @static
*/
static public $check_features = array(
public static $check_features = array(
'ccc' => array( // feature key name
'attributes' => array(
'available' => array(
@@ -261,11 +261,13 @@ class AdminThemes extends AdminPreferences
*/
public function postProcess()
{
global $smarty;
// new check compatibility theme feature (1.4) :
$val = Tools::getValue('PS_THEME');
Configuration::updateValue('PS_IMG_UPDATE_TIME', time());
if (!empty($val) AND !$this->_isThemeCompatible($val)) // don't submit if errors
unset($_POST['submitThemes'.$this->table]);
Tools::clearCache($smarty);
parent::postProcess();
}
}