Merge pull request #45 from MageMill/master

edannenberg · edannenberg · commit a8feadb67e37 · 2016-01-31T03:27:59.000+01:00
PHP7 compatibility
diff --git a/app/code/community/Hackathon/MageMonitoring/Model/Widget/System/Abstract.php b/app/code/community/Hackathon/MageMonitoring/Model/Widget/System/Abstract.php
@@ -138,7 +138,7 @@ public function getMagentoInfo($value)
     {
         if (is_null($this->_mageInfo)) {
             $this->_mageInfo['version'] = Mage::getVersion() .
-                (method_exists(Mage, 'getEdition') ? (' ' . Mage::getEdition() . ' Edition') : '');
+                (method_exists('Mage', 'getEdition') ? (' ' . Mage::getEdition() . ' Edition') : '');
             $statInfo = $this->getMagentoStatInfo();
             if (!is_null($statInfo)) {
                 $this->_mageInfo = array_merge($this->_mageInfo, $statInfo);

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function getMagentoInfo($value)`
`138`	`138`	`{`
`139`	`139`	`if (is_null($this->_mageInfo)) {`
`140`	`140`	`$this->_mageInfo['version'] = Mage::getVersion() .`
`141`		`- (method_exists(Mage, 'getEdition') ? (' ' . Mage::getEdition() . ' Edition') : '');`
	`141`	`+ (method_exists('Mage', 'getEdition') ? (' ' . Mage::getEdition() . ' Edition') : '');`
`142`	`142`	`$statInfo = $this->getMagentoStatInfo();`
`143`	`143`	`if (!is_null($statInfo)) {`
`144`	`144`	`$this->_mageInfo = array_merge($this->_mageInfo, $statInfo);`