From 80f30123458f73023ddf2bfc644878ada4fefbdd Mon Sep 17 00:00:00 2001 From: PrestaEdit Date: Sun, 30 Dec 2012 20:14:51 +0100 Subject: [PATCH 1/4] [-] Project: Fix bug when you want to upload (and resize) an image --- classes/ImageManager.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/ImageManager.php b/classes/ImageManager.php index 8ddb8e811..cd55a4a9b 100644 --- a/classes/ImageManager.php +++ b/classes/ImageManager.php @@ -119,6 +119,8 @@ class ImageManagerCore */ public static function resize($src_file, $dst_file, $dst_width = null, $dst_height = null, $file_type = 'jpg', $force_type = false) { + clearstatcache(true, $src_file); + if (!file_exists($src_file) || !filesize($src_file)) return false; list($src_width, $src_height, $type) = getimagesize($src_file); From b83b0215a09f87184fcafaeef5c7d40156f23fd2 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 31 Dec 2012 09:42:07 +0100 Subject: [PATCH 2/4] [-] Installer : mysql text cannot have a default value #PSCFV-6395 --- install-dev/upgrade/sql/1.5.3.0.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-dev/upgrade/sql/1.5.3.0.sql b/install-dev/upgrade/sql/1.5.3.0.sql index bfd68fd6a..1c16a4f26 100644 --- a/install-dev/upgrade/sql/1.5.3.0.sql +++ b/install-dev/upgrade/sql/1.5.3.0.sql @@ -22,4 +22,4 @@ DELETE FROM `PREFIX_configuration` WHERE `name`= 'PS_HIGH_HTML_THEME_COMPRESSION INSERT INTO `PREFIX_configuration`(`name`, `value`, `date_add`, `date_upd`) VALUES ('PS_MAIL_COLOR', '#db3484', NOW(), NOW()); -ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; +ALTER TABLE `PREFIX_cart` CHANGE `delivery_option` `delivery_option` TEXT CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL; From 0c6b1aaf77624247ea307e07eeb6f637cdd1ff25 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 31 Dec 2012 09:45:10 +0100 Subject: [PATCH 3/4] // Missing part of a fix --- install-dev/data/db_structure.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-dev/data/db_structure.sql b/install-dev/data/db_structure.sql index bf5cbc15c..c57c08f2a 100644 --- a/install-dev/data/db_structure.sql +++ b/install-dev/data/db_structure.sql @@ -170,7 +170,7 @@ CREATE TABLE `PREFIX_cart` ( `id_shop_group` INT(11) UNSIGNED NOT NULL DEFAULT '1', `id_shop` INT(11) UNSIGNED NOT NULL DEFAULT '1', `id_carrier` int(10) unsigned NOT NULL, - `delivery_option` varchar(100), + `delivery_option` TEXT NOT NULL, `id_lang` int(10) unsigned NOT NULL, `id_address_delivery` int(10) unsigned NOT NULL, `id_address_invoice` int(10) unsigned NOT NULL, From 6c00cf69e00afa339c1ea4c0707f178a0c323814 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 31 Dec 2012 10:22:38 +0100 Subject: [PATCH 4/4] [-] BO : fixed accentuated URLs in products --- js/admin.js | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/js/admin.js b/js/admin.js index 8d159c6c8..78a4538ca 100644 --- a/js/admin.js +++ b/js/admin.js @@ -27,16 +27,38 @@ var ajax_running_timeout = null; if (!id_language) var id_language = Number(1); -function str2url(str,encoding,ucfirst) +function str2url(str, encoding, ucfirst) { str = str.toUpperCase(); str = str.toLowerCase(); if (PS_ALLOW_ACCENTED_CHARS_URL) str = str.replace(/[^a-z0-9\s\'\:\/\[\]-]\\u00A1-\\uFFFF/g,''); - else + else + { + str = str.replace(/[\u0105\u0104\u00E0\u00E1\u00E2\u00E3\u00E4\u00E5]/g,'a'); + str = str.replace(/[\u00E7\u010D\u0107\u0106]/g,'c'); + str = str.replace(/[\u010F]/g,'d'); + str = str.replace(/[\u00E8\u00E9\u00EA\u00EB\u011B\u0119\u0118\u0117]/g,'e'); + str = str.replace(/[\u00EC\u00ED\u00EE\u00EF\u012F]/g,'i'); + str = str.replace(/[\u0142\u0141]/g,'l'); + str = str.replace(/[\u00F1\u0148]/g,'n'); + str = str.replace(/[\u00F2\u00F3\u00F4\u00F5\u00F6\u00F8\u00D3]/g,'o'); + str = str.replace(/[\u0159]/g,'r'); + str = str.replace(/[\u015B\u015A\u0161]/g,'s'); + str = str.replace(/[\u00DF]/g,'ss'); + str = str.replace(/[\u0165]/g,'t'); + str = str.replace(/[\u00F9\u00FA\u00FB\u00FC\u016F\u016B\u0173]/g,'u'); + str = str.replace(/[\u00FD\u00FF]/g,'y'); + str = str.replace(/[\u017C\u017A\u017B\u0179\u017E]/g,'z'); + str = str.replace(/[\u00E6]/g,'ae'); + str = str.replace(/[\u0153]/g,'oe'); + str = str.replace(/[\u013E\u013A]/g,'l'); + str = str.replace(/[\u0155]/g,'r'); + str = str.replace(/[^a-z0-9\s\'\:\/\[\]-]/g,''); - str = str.replace(/[\u0028\u0029\u0021\u003F\u002E\u0026\u005E\u007E\u002B\u002A\u002F\u003A\u003B\u003C\u003D\u003E]/g,''); - str = str.replace(/[\s\'\:\/\[\]-]+/g,' '); + } + str = str.replace(/[\u0028\u0029\u0021\u003F\u002E\u0026\u005E\u007E\u002B\u002A\u002F\u003A\u003B\u003C\u003D\u003E]/g, ''); + str = str.replace(/[\s\'\:\/\[\]-]+/g, ' '); // Add special char not used for url rewrite str = str.replace(/[ ]/g, '-');