magento
diff --git a/‎.gitignore
Lines changed: 3 additions & 3 deletions b/‎.gitignore
Lines changed: 3 additions & 3 deletions
diff --git a/‎CHANGELOG.markdown
Lines changed: 332 additions & 3 deletions b/‎CHANGELOG.markdown
Lines changed: 332 additions & 3 deletions
diff --git a/‎app/Mage.php
Lines changed: 9 additions & 4 deletions b/‎app/Mage.php
Lines changed: 9 additions & 4 deletions
diff --git a/‎app/bootstrap.php
Lines changed: 5 additions & 17 deletions b/‎app/bootstrap.php
Lines changed: 5 additions & 17 deletions
diff --git a/‎app/code/Mage/AdminNotification/Block/Grid/Renderer/Actions.php
Lines changed: 60 additions & 0 deletions b/‎app/code/Mage/AdminNotification/Block/Grid/Renderer/Actions.php
Lines changed: 60 additions & 0 deletions
diff --git a/‎app/code/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php renamed to ‎app/code/Mage/AdminNotification/Block/Grid/Renderer/Notice.php
Lines changed: 5 additions & 12 deletions b/‎app/code/Mage/Adminhtml/Block/Notification/Grid/Renderer/Notice.php renamed to ‎app/code/Mage/AdminNotification/Block/Grid/Renderer/Notice.php
Lines changed: 5 additions & 12 deletions
diff --git a/‎app/code/Mage/AdminNotification/Block/Grid/Renderer/Severity.php
Lines changed: 81 additions & 0 deletions b/‎app/code/Mage/AdminNotification/Block/Grid/Renderer/Severity.php
Lines changed: 81 additions & 0 deletions
diff --git a/‎app/code/Mage/AdminNotification/Block/Inbox.php
Lines changed: 44 additions & 0 deletions b/‎app/code/Mage/AdminNotification/Block/Inbox.php
Lines changed: 44 additions & 0 deletions
@@ -10,11 +10,11 @@ atlassian*
 /sitemap
 /.htaccess.orig
 /.idea
+/.gitattributes
 /app/config_sandbox
 /app/etc/local.xml
 /app/etc/local.xml.*
-/app/etc/modules/XEnterprise_Edition.xml
-/app/etc/modules/XSaas_Edition.xml
+/app/etc/modules/*.xml
 /downloader/.cache
 /downloader/cache.cfg
 /downloader/connect.cfg
@@ -26,10 +26,10 @@ atlassian*
 /lib/flex/varien/.flexLibProperties
 /lib/flex/varien/.project
 /lib/flex/varien/.settings
+/pub/cache/*
 /pub/media/*
 /pub/media/customer/*
 /pub/media/downloadable/*
 /pub/static/*
 !/pub/static/.htaccess
 /var/*
-*swp
@@ -99,6 +99,11 @@ final class Mage
     const EDITION_PROFESSIONAL = 'Professional';
     const EDITION_GO           = 'Go';
 
+    /**
+     * Default timezone
+     */
+    const DEFAULT_TIMEZONE  = 'UTC';
+
     /**
      * Registry collection
      *
@@ -165,7 +170,7 @@ final class Mage
     /**
      * Design object
      *
-     * @var Mage_Core_Model_Design_Package
+     * @var Mage_Core_Model_View_DesignInterface
      */
     protected static $_design;
 
@@ -218,7 +223,7 @@ public static function getVersionInfo()
             'revision'  => '0',
             'patch'     => '0',
             'stability' => 'dev',
-            'number'    => '44',
+            'number'    => '45',
         );
     }
 
@@ -444,12 +449,12 @@ public static function getUrl($route = '', $params = array())
     /**
      * Get design package singleton
      *
-     * @return Mage_Core_Model_Design_Package
+     * @return Mage_Core_Model_View_DesignInterface
      */
     public static function getDesign()
     {
         if (!self::$_design) {
-            self::$_design = self::getObjectManager()->get('Mage_Core_Model_Design_Package');
+            self::$_design = self::getObjectManager()->get('Mage_Core_Model_View_DesignInterface');
         }
         return self::$_design;
     }
 
@@ -34,7 +34,7 @@
  * Environment initialization
  */
 error_reporting(E_ALL | E_STRICT);
-ini_set('display_errors', 1);
+#ini_set('display_errors', 1);
 umask(0);
 
 /**
@@ -47,7 +47,6 @@
 Magento_Autoload_IncludePath::addIncludePath(array(
     BP . DS . 'app' . DS . 'code',
     BP . DS . 'lib',
-    BP . DS . 'var' . DS . 'generation',
 ));
 $classMapPath = BP . DS . 'var/classmap.ser';
 if (file_exists($classMapPath)) {
@@ -86,21 +85,10 @@
         }
         exit;
     }
-    if (!empty($_SERVER['MAGE_PROFILER'])) {
-        $profilerConfigData = $_SERVER['MAGE_PROFILER'];
-
-        $profilerConfig = array(
-            'baseDir' => dirname(__DIR__),
-            'tagFilters' => array()
-        );
 
-        if (is_scalar($profilerConfigData)) {
-            $profilerConfig['driver'] = array(
-                'output' => is_numeric($profilerConfigData) ? 'html' : $profilerConfigData
-            );
-        } elseif (is_array($profilerConfigData)) {
-            $profilerConfig = array_merge($profilerConfig, $profilerConfigData);
-        }
-        Magento_Profiler::applyConfig($profilerConfig);
+    if (!empty($_SERVER['MAGE_PROFILER'])) {
+        Magento_Profiler::applyConfig($_SERVER['MAGE_PROFILER'], dirname(__DIR__), !empty($_REQUEST['isAjax']));
     }
 }
+set_error_handler(Mage::DEFAULT_ERROR_HANDLER);
+date_default_timezone_set(Mage::DEFAULT_TIMEZONE);
@@ -0,0 +1,60 @@
+<?php
+/**
+ * Adminhtml AdminNotification Severity Renderer
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+class Mage_AdminNotification_Block_Grid_Renderer_Actions
+    extends Mage_Backend_Block_Widget_Grid_Column_Renderer_Abstract
+{
+    /**
+     * Renders grid column
+     *
+     * @param   Varien_Object $row
+     * @return  string
+     */
+    public function render(Varien_Object $row)
+    {
+        $readDetailsHtml = ($row->getUrl())
+            ? '<a target="_blank" href="'. $row->getUrl() .'">' .
+                $this->helper('Mage_AdminNotification_Helper_Data')->__('Read Details') .'</a> | '
+            : '';
+
+        $markAsReadHtml = (!$row->getIsRead())
+            ? '<a href="'. $this->getUrl('*/*/markAsRead/', array('_current' => true, 'id' => $row->getId())) .'">' .
+                $this->helper('Mage_AdminNotification_Helper_Data')->__('Mark as Read') .'</a> | '
+            : '';
+
+        $encodedUrl = $this->helper('Mage_Core_Helper_Url')->getEncodedUrl();
+        return sprintf('%s%s<a href="%s" onClick="deleteConfirm(\'%s\', this.href); return false;">%s</a>',
+            $readDetailsHtml,
+            $markAsReadHtml,
+            $this->getUrl('*/*/remove/', array(
+                '_current'=>true,
+                'id' => $row->getId(),
+                Mage_Core_Controller_Front_Action::PARAM_NAME_URL_ENCODED => $encodedUrl)
+            ),
+            $this->helper('Mage_AdminNotification_Helper_Data')->__('Are you sure?'),
+            $this->helper('Mage_AdminNotification_Helper_Data')->__('Remove')
+        );
+    }
+}
@@ -1,5 +1,7 @@
 <?php
 /**
+ * Adminhtml AdminNotification Severity Renderer
+ *
  * Magento
  *
  * NOTICE OF LICENSE
@@ -19,21 +21,12 @@
  * needs please refer to http://www.magentocommerce.com for more information.
  *
  * @category    Mage
- * @package     Mage_Adminhtml
+ * @package     Mage_AdminNotification
  * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
  * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
  */
-
-
-/**
- * Adminhtml AdminNotification Severity Renderer
- *
- * @category   Mage
- * @package    Mage_Adminhtml
- * @author      Magento Core Team <[email protected]>
- */
-class Mage_Adminhtml_Block_Notification_Grid_Renderer_Notice
-    extends Mage_Adminhtml_Block_Widget_Grid_Column_Renderer_Abstract
+class Mage_AdminNotification_Block_Grid_Renderer_Notice
+    extends Mage_Backend_Block_Widget_Grid_Column_Renderer_Abstract
 {
     /**
      * Renders grid column
 
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Adminhtml AdminNotification Severity Renderer
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_AdminNotification
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+class Mage_AdminNotification_Block_Grid_Renderer_Severity
+    extends Mage_Backend_Block_Widget_Grid_Column_Renderer_Abstract
+{
+    /**
+     * @var Mage_AdminNotification_Model_Inbox
+     */
+    protected $_notice;
+
+    /**
+     * @param Mage_Backend_Block_Context $context
+     * @param Mage_AdminNotification_Model_Inbox $notice
+     * @param array $data
+     */
+    public function __construct(
+        Mage_Backend_Block_Context $context,
+        Mage_AdminNotification_Model_Inbox $notice,
+        array $data = array()
+    ) {
+        parent::__construct($context, $data);
+        $this->_notice = $notice;
+    }
+
+    /**
+     * Renders grid column
+     *
+     * @param   Varien_Object $row
+     * @return  string
+     */
+    public function render(Varien_Object $row)
+    {
+        $class = '';
+        $value = '';
+
+        switch ($row->getData($this->getColumn()->getIndex())) {
+            case Mage_AdminNotification_Model_Inbox::SEVERITY_CRITICAL:
+                $class = 'critical';
+                $value = $this->_notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_CRITICAL);
+                break;
+            case Mage_AdminNotification_Model_Inbox::SEVERITY_MAJOR:
+                $class = 'major';
+                $value = $this->_notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_MAJOR);
+                break;
+            case Mage_AdminNotification_Model_Inbox::SEVERITY_MINOR:
+                $class = 'minor';
+                $value = $this->_notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_MINOR);
+                break;
+            case Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE:
+                $class = 'notice';
+                $value = $this->_notice->getSeverities(Mage_AdminNotification_Model_Inbox::SEVERITY_NOTICE);
+                break;
+        }
+        return '<span class="grid-severity-' . $class . '"><span>' . $value . '</span></span>';
+    }
+}
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Adminhtml AdminNotification inbox grid
+ *
+ * Magento
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade Magento to newer
+ * versions in the future. If you wish to customize Magento for your
+ * needs please refer to http://www.magentocommerce.com for more information.
+ *
+ * @category    Mage
+ * @package     Mage_AdminNotification
+ * @copyright   Copyright (c) 2013 X.commerce, Inc. (http://www.magentocommerce.com)
+ * @license     http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+class Mage_AdminNotification_Block_Inbox extends Mage_Backend_Block_Widget_Grid_Container
+{
+    protected function _construct()
+    {
+        $this->_controller = 'adminhtml';
+        $this->_blockGroup = 'Mage_AdminNotification';
+        $this->_headerText = $this->_helperFactory->get('Mage_AdminNotification_Helper_Data')->__('Messages Inbox');
+        parent::_construct();
+    }
+
+    protected function _prepareLayout()
+    {
+        parent::_prepareLayout();
+        $this->_removeButton('add');
+        return $this;
+    }
+}
Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,11 @@ final class Mage`
`99`	`99`	`const EDITION_PROFESSIONAL = 'Professional';`
`100`	`100`	`const EDITION_GO = 'Go';`
`101`	`101`
	`102`	`+ /**`
	`103`	`+ * Default timezone`
	`104`	`+ */`
	`105`	`+ const DEFAULT_TIMEZONE = 'UTC';`
	`106`	`+`
`102`	`107`	`/**`
`103`	`108`	`* Registry collection`
`104`	`109`	`*`
`@@ -165,7 +170,7 @@ final class Mage`
`165`	`170`	`/**`
`166`	`171`	`* Design object`
`167`	`172`	`*`
`168`		`- * @var Mage_Core_Model_Design_Package`
	`173`	`+ * @var Mage_Core_Model_View_DesignInterface`
`169`	`174`	`*/`
`170`	`175`	`protected static $_design;`
`171`	`176`
`@@ -218,7 +223,7 @@ public static function getVersionInfo()`
`218`	`223`	`'revision' => '0',`
`219`	`224`	`'patch' => '0',`
`220`	`225`	`'stability' => 'dev',`
`221`		`- 'number' => '44',`
	`226`	`+ 'number' => '45',`
`222`	`227`	`);`
`223`	`228`	`}`
`224`	`229`
`@@ -444,12 +449,12 @@ public static function getUrl($route = '', $params = array())`
`444`	`449`	`/**`
`445`	`450`	`* Get design package singleton`
`446`	`451`	`*`
`447`		`- * @return Mage_Core_Model_Design_Package`
	`452`	`+ * @return Mage_Core_Model_View_DesignInterface`
`448`	`453`	`*/`
`449`	`454`	`public static function getDesign()`
`450`	`455`	`{`
`451`	`456`	`if (!self::$_design) {`
`452`		`- self::$_design = self::getObjectManager()->get('Mage_Core_Model_Design_Package');`
	`457`	`+ self::$_design = self::getObjectManager()->get('Mage_Core_Model_View_DesignInterface');`
`453`	`458`	`}`
`454`	`459`	`return self::$_design;`
`455`	`460`	`}`