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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
vAugagneur
2012-12-07 18:01:46 +01:00
parent af3eb2cc38 3280bfbeed
commit 90d4c27d17
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Translate.php
+4 -2
View File
@@ -116,7 +116,7 @@ class TranslateCore
* @param string $source
* @return string
*/
public static function getModuleTranslation($module, $string, $source, $sprintf = null)
public static function getModuleTranslation($module, $string, $source, $sprintf = null, $js = false)
{
global $_MODULES, $_MODULE, $_LANGADM;
@@ -126,7 +126,6 @@ class TranslateCore
static $translations_merged = array();
$name = $module instanceof Module ? $module->name : $module;
if (!isset($translations_merged[$name]))
{
$filesByPriority = array(
@@ -175,6 +174,9 @@ class TranslateCore
if ($sprintf !== null)
$ret = Translate::checkAndReplaceArgs($ret, $sprintf);
if ($js)
$ret = addslashes($ret);
$lang_cache[$cache_key] = str_replace('"', '"', $ret);
}
return $lang_cache[$cache_key];
classes/webservice/WebserviceSpecificManagementImages.php
+6 -1
View File
@@ -692,8 +692,13 @@ class WebserviceSpecificManagementImagesCore implements WebserviceSpecificManage
$image = new Image((int)$this->wsObject->urlSegment[3]);
return $image->delete();
}
elseif (in_array($this->imageType, array('categories', 'manufacturers', 'suppliers', 'stores'))
{
$object = new $this->wsObject->resourceList[$this->imageType]['class']((int)$this->wsObject->urlSegment[3]);
return $object->deleteImage(true);
}
else
return $this->deleteImageOnDisk($filename, $imageSizes, $directory);
return $this->deleteImageOnDisk($filename, $imageSizes, $directory);
}
else
throw new WebserviceException('This image does not exist on disk', array(64, 500));
config/smartyfront.config.inc.php
+3 -3
View File
@@ -30,7 +30,7 @@ function smartyTranslate($params, &$smarty)
{
global $_LANG;
if (!isset($params['js'])) $params['js'] = 0;
if (!isset($params['js'])) $params['js'] = false;
if (!isset($params['pdf'])) $params['pdf'] = false;
if (!isset($params['mod'])) $params['mod'] = false;
if (!isset($params['sprintf'])) $params['sprintf'] = null;
@@ -45,7 +45,7 @@ function smartyTranslate($params, &$smarty)
$key = 'override_'.$key;
if ($params['mod'])
return Translate::getModuleTranslation($params['mod'], $params['s'], $basename, $params['sprintf']);
return Translate::getModuleTranslation($params['mod'], $params['s'], $basename, $params['sprintf'], $params['js']);
else if ($params['pdf'])
return Translate::getPdfTranslation($params['s']);
@@ -62,6 +62,6 @@ function smartyTranslate($params, &$smarty)
if ($params['sprintf'] !== null)
$msg = Translate::checkAndReplaceArgs($msg, $params['sprintf']);
return $params['js'] ? $msg : Tools::htmlentitiesUTF8($msg);
return $params['js'] ? $msg : addslashes($msg);
}