From 98aea24fc3ccd5ffb57c8e16358bdbd2a54f1dd7 Mon Sep 17 00:00:00 2001 From: ha99y Date: Fri, 4 Oct 2013 17:18:23 -0700 Subject: [PATCH 1/5] __DIR__ was never defined The JS files would not lode, when in dev mode because __DIR__ was not defined --- js/retro-compat.js.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/js/retro-compat.js.php b/js/retro-compat.js.php index 33aee8c9f..361f0caa9 100755 --- a/js/retro-compat.js.php +++ b/js/retro-compat.js.php @@ -3,7 +3,8 @@ include('../config/config.inc.php'); header('content-type: application/x-javascript'); -$plugins_folder = __DIR__.'/jquery/plugins/'; +$jquery_folder = dirname(__FILE__).'/jquery/'; +$plugins_folder = $jquery_folder.'plugins/'; $plugins = array( 'ajaxfileupload.js' => @@ -51,7 +52,7 @@ $plugins = array( 'jquery.hoverIntent.minified.js' => array('new_file' => $plugins_folder.'jquery.hoverIntent.js', 'name' => 'hoverIntent'), 'jquery-ui-1.8.10.custom.min.js' => - array('new_file' => __DIR__.'/jquery/jquery-ui.will.be.removed.in.1.6.js', 'name' => ''), + array('new_file' => $jquery_folder.'jquery-ui.will.be.removed.in.1.6.js', 'name' => ''), 'jquery.treeview.async.js' => array('new_file' => $plugins_folder.'treeview-categories/jquery.treeview-categories.async.js', 'name' => 'treeview-categories.async'), 'jquery.treeview.edit.js' => From 148348855e128297a4562d847b9d82be26059d3f Mon Sep 17 00:00:00 2001 From: ldecoker Date: Sun, 6 Oct 2013 16:31:54 +0200 Subject: [PATCH 2/5] Update OrderDetailController.php Missing $php_self variable --- controllers/front/OrderDetailController.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/controllers/front/OrderDetailController.php b/controllers/front/OrderDetailController.php index a5f9321c1..1130bbc85 100644 --- a/controllers/front/OrderDetailController.php +++ b/controllers/front/OrderDetailController.php @@ -26,6 +26,8 @@ class OrderDetailControllerCore extends FrontController { + public $php_self = 'order-detail'; + public $auth = true; public $authRedirection = 'history'; public $ssl = true; From b941ac007b488fd90523695e0a397bfe2df87f61 Mon Sep 17 00:00:00 2001 From: Tomasz Slominski Date: Mon, 7 Oct 2013 09:57:55 +0200 Subject: [PATCH 3/5] bugfix: button tag on line 56 weren't closed --- .../controllers/carrier_wizard/helpers/form/form_ranges.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl index b19611d31..9fe9b9030 100644 --- a/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl +++ b/admin-dev/themes/default/template/controllers/carrier_wizard/helpers/form/form_ranges.tpl @@ -40,7 +40,7 @@ {foreach from=$ranges key=r item=range} -   {$currency_sign} {/foreach} @@ -53,7 +53,7 @@ {if $smarty.foreach.ranges.first}   {else} - {/if} {/foreach} From 3f4f298ad4e424ac2a538d9188fa01417f72b90f Mon Sep 17 00:00:00 2001 From: Vincent Augagneur Date: Mon, 7 Oct 2013 10:01:26 +0200 Subject: [PATCH 4/5] [-] CORE fixed bug #PSCFV-10595 - small fix in function addJqueryPlugin() --- classes/controller/Controller.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/classes/controller/Controller.php b/classes/controller/Controller.php index 27ebaf040..5309aca01 100644 --- a/classes/controller/Controller.php +++ b/classes/controller/Controller.php @@ -334,12 +334,14 @@ abstract class ControllerCore } } else + { $plugin_path = Media::getJqueryPluginPath($name, $folder); if(!empty($plugin_path['css'])) $this->addCSS($plugin_path['css']); if(!empty($plugin_path['js'])) $this->addJS($plugin_path['js']); + } } /** From 4254ae6edcf63203e25f1834b75c02e2e660d114 Mon Sep 17 00:00:00 2001 From: Tomasz Slominski Date: Mon, 7 Oct 2013 10:05:43 +0200 Subject: [PATCH 5/5] typo fixed in polish installer translation (line 85) --- install-dev/langs/pl/install.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install-dev/langs/pl/install.php b/install-dev/langs/pl/install.php index 7b23e1327..ba2a0767e 100644 --- a/install-dev/langs/pl/install.php +++ b/install-dev/langs/pl/install.php @@ -82,7 +82,7 @@ return array( 'You must enter a database login' => 'Podaj login dla bazy danych', 'Tables prefix is invalid' => 'Prefiks tebeli jest niepoprawny ', 'Wrong engine chosen for MySQL' => 'Silnik dla MySQL jest niepoprawny', - 'Cannot convert database data to utf-8' => 'Nie można przekonwertowąć bazy danych na utf-8', + 'Cannot convert database data to utf-8' => 'Nie można przekonwertować bazy danych na utf-8', 'At least one table with same prefix was already found, please change your prefix or drop your database' => 'Co najmniej jedna tabela z tym samym prefiksem została znaleziona - proszę zmienić aktualny prefiks lub usunąć istniejące tabele.', 'Database Server is not found. Please verify the login, password and server fields' => 'Nie można połączyć się z serwerem bazy danych. Sprawdź swój login i hasło.', 'Connection to MySQL server succeeded, but database "%s" not found' => 'Połączenie do serwera MySQL odbyło się poprawnie lecz baza danych "%is" nie została znaleziona.',