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 bootstrap

Browse Source 
Conflicts:
	admin-dev/themes/default/css/admin.css
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl
	admin-dev/themes/default/template/controllers/categories/helpers/form/form.tpl
	admin-dev/themes/default/template/controllers/home/content.tpl
	admin-dev/themes/default/template/controllers/localization/content.tpl
	admin-dev/themes/default/template/controllers/orders/_customized_data.tpl
	admin-dev/themes/default/template/controllers/orders/_new_product.tpl
	admin-dev/themes/default/template/controllers/orders/_product_line.tpl
	admin-dev/themes/default/template/controllers/orders/helpers/view/view.tpl
	admin-dev/themes/default/template/controllers/tax_rules/helpers/list/list_header.tpl
	admin-dev/themes/default/template/footer.tpl
	controllers/admin/AdminCarrierWizardController.php
	controllers/admin/AdminCarriersController.php
	controllers/admin/AdminCmsController.php
	controllers/admin/AdminLocalizationController.php
	controllers/admin/AdminManufacturersController.php
	controllers/admin/AdminSuppliersController.php
	css/admin.css
	js/admin-products.js
	js/admin_carrier_wizard.js
	translations/fr.gzip
This commit is contained in:
Kevin Granger
2013-09-13 11:41:14 +02:00
parent ce74aeb357 db4b69d10c
commit c7ec33f062
247 changed files with 7965 additions and 4936 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/smarty/sysplugins/smarty_internal_cacheresource_file.php
+1 -1
View File
@@ -178,7 +178,7 @@
$_cacheDirs = new RecursiveDirectoryIterator($_dir);
$_cache = new RecursiveIteratorIterator($_cacheDirs, RecursiveIteratorIterator::CHILD_FIRST);
foreach ($_cache as $_file) {
if (substr(basename($_file->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false) continue;
if (substr(basename($_file->getPathname()),0,1) == '.' || strpos($_file, '.svn') !== false || strpos($_file, 'index.php') !== false) continue;
// directory ?
if ($_file->isDir()) {
if (!$_cache->isDot()) {
tools/smarty/sysplugins/smarty_internal_templatebase.php
+1 -1
View File
@@ -278,7 +278,7 @@ abstract class Smarty_Internal_TemplateBase extends Smarty_Internal_Data {
//
// render cached template
//
$_template->properties['unifunc']($_template);
$_template->properties['unifunc']($_template);
// any unclosed {capture} tags ?
if (isset($_template->_capture_stack[0][0])) {
$_template->capture_error();
tools/swift/Swift/Message/Headers.php
+7 -5
View File
@@ -420,11 +420,7 @@ class Swift_Message_Headers
if (false !== $p = strpos($encoded_value[$key], $this->LE))
{
$encoded_value[$key] = preg_replace_callback("/<([^>]+)>/",
function ($matches)
{
return str_replace("' . $this->LE . '", "", "<$matches[1]>");
}, $encoded_value[$key]);
$encoded_value[$key] = preg_replace_callback("/<([^>]+)>/", array($this, 'prestaShopReplace'), $encoded_value[$key]);
}
//Turn our header into an array of lines ready for wrapping around the encoding specification
@@ -556,6 +552,12 @@ class Swift_Message_Headers
}
return $ret;
}
public function prestaShopReplace($matches)
{
return str_replace("' . $this->LE . '", "", "<$matches[1]>");
}
/**
* Compile the list of headers which have been set and return an ascii string
* The return value should always be 7-bit ascii and will have been cleaned for header injection