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

// context->controller now work for adminController too

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9090 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-10-06 09:55:28 +00:00
parent 6c7d1a5ee7
commit 3d0e96b313
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Controller.php
+7 -6
View File
@@ -106,6 +106,7 @@ abstract class ControllerCore
$this->display_footer = true;
$this->context = Context::getContext();
$this->context->controller = $this;
$this->ajax = Tools::getValue('ajax') || Tools::isSubmit('ajax');
}
@@ -185,7 +186,7 @@ abstract class ControllerCore
if ($css_path)
$this->css_files = array_merge($css_path, $this->css_files);
}
else
else
{
$css_path = Media::getCSSPath($media, $css_media_type);
if ($css_path)
@@ -222,7 +223,7 @@ abstract class ControllerCore
$this->js_files[] = $js_path;
}
}
/**
* Add a new javascript file in page header.
*
@@ -233,7 +234,7 @@ abstract class ControllerCore
{
$this->addJS(Media::getJqueryPath($version, $folder, $minifier));
}
/**
* Add a new javascript file in page header.
*
@@ -252,7 +253,7 @@ abstract class ControllerCore
$this->addCSS($ui_path['css']);
$this->addJS($ui_path['js']);
}
/**
* Add a new javascript file in page header.
*
@@ -268,12 +269,12 @@ abstract class ControllerCore
{
$plugin_path = Media::getJqueryPluginPath($plugin);
$this->addJS($plugin_path['js']);
$this->addCSS($plugin_path['css']);
$this->addCSS($plugin_path['css']);
}
}
else
$plugin_path = Media::getJqueryPluginPath($name);
$this->addCSS($plugin_path['css']);
$this->addJS($plugin_path['js']);
}