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

Merge pull request #978 from StanProg/bootstrap

Browse Source 
// FO : Removed unused local variable, tabs added, phpdoc tags
This commit is contained in:
Rémi Gaillard
2013-11-18 06:27:46 -08:00
parent 4c51570b34 c5b1834870
commit f4194bedd9
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Referrer.php
+1 -1
View File
@@ -252,6 +252,7 @@ class ReferrerCore extends ObjectModel
*
* @param array $referrers
* @param int $employee
* @return true
*/
public static function refreshCache($referrers = null, $employee = null)
{
@@ -265,7 +266,6 @@ class ReferrerCore extends ObjectModel
if (!$referrer->isAssociatedToShop($shop_id))
continue;
$shop = new Shop($shop_id);
$stats_visits = $referrer->getStatsVisits(null, $employee);
$registrations = $referrer->getRegistrations(null, $employee);
$stats_sales = $referrer->getStatsSales(null, $employee);
classes/controller/Controller.php
+6 -6
View File
@@ -313,12 +313,12 @@ abstract class ControllerCore
/**
* Add a new javascript file in page header.
*
* @param mixed $js_uri
* @param mixed $name
* @param mixed $folder
* @return void
*/
public function addJqueryPlugin($name, $folder = null)
{
$plugin_path = array();
if (is_array($name))
{
foreach ($name as $plugin)
@@ -334,10 +334,10 @@ abstract class ControllerCore
{
$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']);
if(!empty($plugin_path['css']))
$this->addCSS($plugin_path['css']);
if(!empty($plugin_path['js']))
$this->addJS($plugin_path['js']);
}
}