Merge branch '1.9.4.x' into 1.9.4.x

Author: Flyingmana

.htaccess

@@ -5,15 +5,15 @@
 
 ## you might also need to add this line to php.ini
 ##     cgi.fix_pathinfo = 1
-## if it still doesn't work, rename php.ini to php5.ini
+## if it still doesn't work, rename php.ini to php7.ini
 
 ############################################
 ## default index file
 
     DirectoryIndex index.php
 
 ############################################
-## php5 settings
+## php7 settings
 
 <IfModule mod_php7.c>
 

app/Mage.php

@@ -108,13 +108,6 @@ final class Mage
      */
     static private $_objects;
 
-    /**
-     * Is downloader flag
-     *
-     * @var bool
-     */
-    static private $_isDownloader               = false;
-
     /**
      * Is developer mode flag
      *
@@ -267,7 +260,6 @@ public static function reset()
         self::$_config          = null;
         self::$_events          = null;
         self::$_objects         = null;
-        self::$_isDownloader    = false;
         self::$_isDeveloperMode = false;
         self::$_isInstalled     = null;
         // do not reset $headersSentThrowsException
@@ -759,7 +751,7 @@ public static function run($code = '', $type = 'store', $options = array())
             require_once(self::getBaseDir() . DS . 'errors' . DS . '404.php');
             die();
         } catch (Exception $e) {
-            if (self::isInstalled() || self::$_isDownloader) {
+            if (self::isInstalled()) {
                 self::printException($e);
                 exit();
             }
@@ -1061,10 +1053,10 @@ public static function getScriptSystemUrl($folder, $exitIfNot = false)
     /**
      * Set is downloader flag
      *
-     * @param bool $flag
+     * @deprecated
      */
-    public static function setIsDownloader($flag = true)
+    public static function setIsDownloader()
     {
-        self::$_isDownloader = $flag;
+
     }
 }

app/code/core/Mage/Adminhtml/Block/Report/Customer/Accounts.php

@@ -29,12 +29,11 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Customer_Accounts extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-
     public function __construct()
     {
         $this->_controller = 'report_customer_accounts';
@@ -43,4 +42,8 @@ public function __construct()
         $this->_removeButton('add');
     }
 
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Customer/Orders.php

@@ -29,7 +29,7 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Customer_Orders extends Mage_Adminhtml_Block_Widget_Grid_Container
@@ -41,4 +41,9 @@ public function __construct()
         parent::__construct();
         $this->_removeButton('add');
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Customer/Totals.php

@@ -29,7 +29,7 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Customer_Totals extends Mage_Adminhtml_Block_Widget_Grid_Container
@@ -41,4 +41,9 @@ public function __construct()
         parent::__construct();
         $this->_removeButton('add');
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Product.php

@@ -29,11 +29,11 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
+
 class Mage_Adminhtml_Block_Report_Product extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-
     public function __construct()
     {
         $this->_controller = 'report_product';
@@ -42,4 +42,8 @@ public function __construct()
         $this->_removeButton('add');
     }
 
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Product/Downloads.php

@@ -55,14 +55,16 @@ protected function _prepareLayout()
 
     public function getStoreSwitcherHtml()
     {
-        if (!Mage::app()->isSingleStoreMode()) {
-            return $this->getChildHtml('store_switcher');
-        }
-        return '';
+        return Mage::app()->isSingleStoreMode() ? '' : $this->getChildHtml('store_switcher');
     }
 
     public function getGridHtml()
     {
         return $this->getStoreSwitcherHtml() . parent::getGridHtml();
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Product/Lowstock.php

@@ -29,7 +29,7 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Product_Lowstock extends Mage_Adminhtml_Block_Widget_Grid_Container
@@ -50,20 +50,21 @@ protected function _prepareLayout()
                 ->setSwitchUrl($this->getUrl('*/*/*', array('store'=>null)))
                 ->setTemplate('report/store/switcher.phtml')
         );
-
         return parent::_prepareLayout();
     }
 
     public function getStoreSwitcherHtml()
     {
-        if (Mage::app()->isSingleStoreMode()) {
-            return '';
-        }
-        return $this->getChildHtml('store_switcher');
+        return Mage::app()->isSingleStoreMode() ? '' : $this->getChildHtml('store_switcher');
     }
 
     public function getGridHtml()
     {
         return $this->getStoreSwitcherHtml() . parent::getGridHtml();
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Product/Ordered.php

@@ -29,6 +29,7 @@
  *
  * @deprecated after 1.4.0.1
  */
+
 class Mage_Adminhtml_Block_Report_Product_Ordered extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
     public function __construct()
@@ -38,4 +39,9 @@ public function __construct()
         parent::__construct();
         $this->_removeButton('add');
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Product/Sold.php

@@ -24,25 +24,26 @@
  * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
 
-
 /**
  * Adminhtml Report Sold Product Content Block
  *
  * @category   Mage
  * @package    Mage_Adminhtml
  * @author     Magento Core Team <[email protected]>
  */
+
 class Mage_Adminhtml_Block_Report_Product_Sold extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-    /**
-     * Initialize container block settings
-     *
-     */
     public function __construct()
     {
         $this->_controller = 'report_product_sold';
         $this->_headerText = Mage::helper('reports')->__('Products Ordered');
         parent::__construct();
         $this->_removeButton('add');
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Product/Viewed.php

@@ -29,7 +29,7 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Product_Viewed extends Mage_Adminhtml_Block_Widget_Grid_Container
@@ -47,14 +47,14 @@ public function __construct()
         ));
     }
 
-    /**
-     * Get filter url
-     *
-     * @return string
-     */
     public function getFilterUrl()
     {
         $this->getRequest()->setParam('filter', null);
         return $this->getUrl('*/*/viewed', array('_current' => true));
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Refresh/Statistics.php

@@ -41,4 +41,9 @@ public function __construct()
         parent::__construct();
         $this->_removeButton('add');
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Review/Customer.php

@@ -29,12 +29,11 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Review_Customer extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-
     public function __construct()
     {
         $this->_controller = 'report_review_customer';
@@ -43,4 +42,8 @@ public function __construct()
         $this->_removeButton('add');
     }
 
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Review/Detail.php

@@ -29,23 +29,24 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Review_Detail extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-
     public function __construct()
     {
         $this->_controller = 'report_review_detail';
-
         $product = Mage::getModel('catalog/product')->load($this->getRequest()->getParam('id'));
         $this->_headerText = Mage::helper('reports')->__('Reviews for %s', $this->escapeHtml($product->getName()));
-
         parent::__construct();
         $this->_removeButton('add');
         $this->setBackUrl($this->getUrl('*/report_review/product/'));
         $this->_addBackButton();
     }
 
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Review/Product.php

@@ -29,11 +29,11 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
+
 class Mage_Adminhtml_Block_Report_Review_Product extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-
     public function __construct()
     {
         $this->_controller = 'report_review_product';
@@ -42,4 +42,8 @@ public function __construct()
         $this->_removeButton('add');
     }
 
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }

app/code/core/Mage/Adminhtml/Block/Report/Sales/Bestsellers.php

@@ -29,12 +29,11 @@
  *
  * @category   Mage
  * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
+ * @author     Magento Core Team <[email protected]>
  */
 
 class Mage_Adminhtml_Block_Report_Sales_Bestsellers extends Mage_Adminhtml_Block_Widget_Grid_Container
 {
-
     public function __construct()
     {
         $this->_controller = 'report_sales_bestsellers';
@@ -53,4 +52,9 @@ public function getFilterUrl()
         $this->getRequest()->setParam('filter', null);
         return $this->getUrl('*/*/bestsellers', array('_current' => true));
     }
+
+    public function getHeaderCssClass()
+    {
+        return 'icon-head head-report';
+    }
 }