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

// Merge -> revision 8720

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8722 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-22 15:45:10 +00:00
parent 69db63f26c
commit 4f2a090e24
87 changed files with 1591 additions and 724 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install-dev/index.php
+1 -1
View File
@@ -778,7 +778,7 @@ if ($lm->getIncludeTradFilename())
return '';
}
$stream_context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 3)));
$stream_context = @stream_context_create(array('http' => array('method'=> 'GET', 'timeout' => 3)));
$content = @file_get_contents('http://www.prestashop.com/partner/preactivation/partners.php?version=1.0', false, $stream_context);
if ($content && $content[0] == '<')
{
install-dev/preactivation.php
+2 -2
View File
@@ -17,7 +17,7 @@
$p = addslashes(strtolower($_GET['partner']));
$c = addslashes(strtolower($_GET['country_iso_code']));
$stream_context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));
$stream_context = @stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));
$content = @file_get_contents('http://www.prestashop.com/partner/preactivation/fields.php?version=1.0&partner='.$p.'&country_iso_code='.$c, false, $stream_context);
if ($content && $content[0] == '<')
@@ -102,7 +102,7 @@
if ($_GET['request'] == 'send')
{
$stream_context = stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));
$stream_context = @stream_context_create(array('http' => array('method'=>"GET", 'timeout' => 5)));
$url = 'http://www.prestashop.com/partner/preactivation/actions.php?version=1.0&partner='.addslashes($_GET['partner']);
// Protect fields
install-dev/sql/db_settings_lite.sql
+13 -3
View File
@@ -73,9 +73,19 @@ INSERT INTO `PREFIX_hook` (`id_hook`, `name`, `title`, `description`, `position`
(70, 'featureForm', 'Add fields to the form "feature"', 'Add fields to the form "feature"', 0, 0),
(71, 'afterSaveFeature', 'On saving attribute feature', 'On saving attribute feature', 0, 0),
(72, 'afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0),
(73, 'taxManager', 'Tax Manager Factory', '' , 0, 0),
(74, 'afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
(75, 'productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0);
(73, 'afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
(74, 'productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0),
(75, 'postProcessAttributeGroup', 'On post-process in admin attribute group', 'On post-process in admin attribute group', 0, 0),
(76, 'postProcessFeature', 'On post-process in admin feature', 'On post-process in admin feature', 0, 0),
(77, 'featureValueForm', 'Add fileds to the form "feature value"', 'Add fileds to the form "feature value"', 0, 0),
(78, 'postProcessFeatureValue', 'On post-process in admin feature value', 'On post-process in admin feature value', 0, 0),
(79, 'afterDeleteFeatureValue', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0),
(90, 'afterSaveFeatureValue', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0),
(91, 'attributeForm', 'Add fileds to the form "feature value"', 'Add fileds to the form "feature value"', 0, 0),
(92, 'postProcessAttribute', 'On post-process in admin feature value', 'On post-process in admin feature value', 0, 0),
(93, 'afterDeleteAttribute', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0),
(94, 'afterSaveAttribute', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0),
(95, 'taxManager', 'Tax Manager Factory', '' , 0, 0);
INSERT INTO `PREFIX_configuration` (`id_configuration`, `name`, `value`, `date_add`, `date_upd`) VALUES
(1, 'PS_LANG_DEFAULT', '1', NOW(), NOW()),
install-dev/sql/upgrade/1.4.5.0.sql
+12 -3
View File
@@ -23,9 +23,18 @@ INSERT INTO `PREFIX_hook` (`name`, `title`, `description`, `position`, `live_edi
('attributeGroupForm', 'Add fields to the form "attribute group"', 'Add fields to the form "attribute group"', 0, 0),
('afterSaveAttributeGroup', 'On saving attribute group', 'On saving attribute group', 0, 0),
('afterDeleteAttributeGroup', 'On deleting attribute group', 'On deleting "attribute group', 0, 0),
('featureForm', 'Add fileds to the form "feature"', 'Add fileds to the form "feature"', 0, 0),
('featureForm', 'Add fields to the form "feature"', 'Add fields to the form "feature"', 0, 0),
('afterSaveFeature', 'On saving attribute feature', 'On saving attribute feature', 0, 0),
('afterDeleteFeature', 'On deleting attribute feature', 'On deleting attribute feature', 0, 0),
('afterSaveProduct', 'On saving products', 'On saving products', 0, 0),
('productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0);
('productListAssign', 'Assign product list to a category', 'Assign product list to a category', 0, 0),
('postProcessAttributeGroup', 'On post-process in admin attribute group', 'On post-process in admin attribute group', 0, 0),
('postProcessFeature', 'On post-process in admin feature', 'On post-process in admin feature', 0, 0),
('featureValueForm', 'Add fields to the form "feature value"', 'Add fields to the form "feature value"', 0, 0),
('postProcessFeatureValue', 'On post-process in admin feature value', 'On post-process in admin feature value', 0, 0),
('afterDeleteFeatureValue', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0),
('afterSaveFeatureValue', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0),
('attributeForm', 'Add fields to the form "feature value"', 'Add fields to the form "feature value"', 0, 0),
('postProcessAttribute', 'On post-process in admin feature value', 'On post-process in admin feature value', 0, 0),
('afterDeleteAttribute', 'On deleting attribute feature value', 'On deleting attribute feature value', 0, 0),
('afterSaveAttribute', 'On saving attribute feature value', 'On saving attribute feature value', 0, 0);
install-dev/xml/checkShopInfos.php
+1 -1
View File
@@ -209,7 +209,7 @@ if (isFormValid())
require_once(dirname(__FILE__).'/../../classes/LocalizationPack.php');
$stream_context = stream_context_create(array('http' => array('timeout' => 5)));
$stream_context = @stream_context_create(array('http' => array('timeout' => 5)));
$localization_file = @Tools::file_get_contents('http://www.prestashop.com/download/localization_pack.php?country='.$_GET['countryName'], false, $stream_context);
if (!$localization_file AND file_exists(dirname(__FILE__).'/../../localization/'.strtolower($_GET['countryName']).'.xml'))
$localization_file = @file_get_contents(dirname(__FILE__).'/../../localization/'.strtolower($_GET['countryName']).'.xml');