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

// fix product edition textarea rte

Browse Source 
// minor fix warning if admin translation file doesnt exists

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10304 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
mMarinetti
2011-11-20 23:06:45 +00:00
parent 9e8d16ad6a
commit 08a389a760
4 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminProductsController.php
+10 -1
View File
@@ -25,7 +25,7 @@
* International Registered Trademark & Property of PrestaShop SA
*/
class AdminProductsController extends AdminController
class AdminProductsControllerCore extends AdminController
{
protected $max_file_size = 20000000;
/** @var integer Max image size for upload
@@ -2435,7 +2435,16 @@ class AdminProductsController extends AdminController
public function initFormInformations($product, $languages, $defaultLanguage)
{
$data = $this->context->smarty->createData();
// autoload rich text editor (tiny mce)
$iso = $this->context->language->iso_code;
$this->tpl_form_vars['iso'] = file_exists(_PS_ROOT_DIR_.'/js/tiny_mce/langs/'.$iso.'.js') ? $iso : 'en';
$this->tpl_form_vars['ad'] = dirname($_SERVER['PHP_SELF']);
$this->tpl_form_vars['tinymce'] = true;
$this->addJS(_PS_JS_DIR_.'tiny_mce/tiny_mce.js');
$this->addJS(_PS_JS_DIR_.'tinymce.inc.js');
$currency = $this->context->currency;
$data->assign('languages',$languages);