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

// reported fix from 1.4.x

Browse Source
This commit is contained in:
mMarinetti
2011-12-21 20:36:17 +00:00
parent 92ee67e74e
commit ccad5bbab8
4 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminBackupController.php
+1
View File
@@ -142,6 +142,7 @@ class AdminBackupControllerCore extends AdminController
'content' => $this->content, 'content' => $this->content,
'url_post' => self::$currentIndex.'&token='.$this->token, 'url_post' => self::$currentIndex.'&token='.$this->token,
)); ));
parent::initContent();
} }
/** /**
controllers/admin/AdminCategoriesController.php
+3
View File
@@ -372,7 +372,10 @@ class AdminCategoriesControllerCore extends AdminController
if (!$object->updatePosition((int)Tools::getValue('way'), (int)Tools::getValue('position'))) if (!$object->updatePosition((int)Tools::getValue('way'), (int)Tools::getValue('position')))
$this->_errors[] = Tools::displayError('Failed to update the position.'); $this->_errors[] = Tools::displayError('Failed to update the position.');
else else
{
$object->regenerateEntireNtree();
Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (int)Tools::getValue($this->identifier, Tools::getValue('id_category_parent', 1))) ? ('&'.$this->identifier.'='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCategories')); Tools::redirectAdmin(self::$currentIndex.'&'.$this->table.'Orderby=position&'.$this->table.'Orderway=asc&conf=5'.(($id_category = (int)Tools::getValue($this->identifier, Tools::getValue('id_category_parent', 1))) ? ('&'.$this->identifier.'='.$id_category) : '').'&token='.Tools::getAdminTokenLite('AdminCategories'));
}
} }
/* Delete multiple objects */ /* Delete multiple objects */
else if (Tools::getValue('submitDel'.$this->table)) else if (Tools::getValue('submitDel'.$this->table))
controllers/admin/AdminCustomerThreadsController.php
+3 -3
View File
@@ -315,9 +315,9 @@ class AdminCustomerThreadsControllerCore extends AdminController
'{comment}' => stripslashes($_POST['message_forward'])); '{comment}' => stripslashes($_POST['message_forward']));
if (Mail::Send( if (Mail::Send(
(int)$cookie->id_lang, $this->context->language->id,
'forward_msg', 'forward_msg',
Mail::l('Fwd: Customer message', (int)$cookie->id_lang), Mail::l('Fwd: Customer message', $this->context->language->id),
$params, $email, null, $params, $email, null,
$current_employee->email, $current_employee->firstname.' '.$current_employee->lastname, $current_employee->email, $current_employee->firstname.' '.$current_employee->lastname,
null, null, _PS_MAIL_DIR_, true)) null, null, _PS_MAIL_DIR_, true))
@@ -357,7 +357,7 @@ class AdminCustomerThreadsControllerCore extends AdminController
); );
//#ct == id_customer_thread #tc == token of thread <== used in the synchronization imap //#ct == id_customer_thread #tc == token of thread <== used in the synchronization imap
if (Mail::Send( if (Mail::Send(
$ct->id_lang, (int)$ct->id_lang,
'reply_msg', 'reply_msg',
Mail::l('An answer to your message is available', $ct->id_lang).' #ct'.$ct->id.'#tc'.$ct->token, Mail::l('An answer to your message is available', $ct->id_lang).' #ct'.$ct->id.'#tc'.$ct->token,
$params, Tools::getValue('msg_email'), null, null, null, $file_attachment, null, $params, Tools::getValue('msg_email'), null, null, null, $file_attachment, null,
controllers/admin/AdminImportController.php
+4 -3
View File
@@ -801,9 +801,10 @@ class AdminImportControllerCore extends AdminController
$category->doNotRegenerateNTree = true; $category->doNotRegenerateNTree = true;
// If id category AND id category already in base, trying to update // If id category AND id category already in base, trying to update
if ($category->id && $category->categoryExists($category->id)) if ($category->id && $category->categoryExists($category->id) && $category->id != 1)
$res = $category->update(); $res = $category->update();
if ($category->id == 1)
$this->_errors[] = Tools::displayError('Root category cannot be modify');
// If no id_category or update failed // If no id_category or update failed
if (!$res) if (!$res)
$res = $category->add(); $res = $category->add();
@@ -1840,4 +1841,4 @@ class AdminImportControllerCore extends AdminController
{ {
$this->warnings[] = $product_name.(isset($product_id) ? ' (ID '.$product_id.')' : '').' '.Tools::displayError($message); $this->warnings[] = $product_name.(isset($product_id) ? ' (ID '.$product_id.')' : '').' '.Tools::displayError($message);
} }
} }