5558 deactivate licensing functionality for free version

avstudnitz · avstudnitz · commit 28c108ec200f · 2016-10-12T10:49:11.000+02:00
diff --git a/src/app/code/community/IntegerNet/Solr/Helper/Module.php b/src/app/code/community/IntegerNet/Solr/Helper/Module.php
@@ -63,6 +63,9 @@ public function isKeyValid($key)
      */
     public function isLicensed()
     {
+        if (!Mage::helper('core')->isModuleEnabled('IntegerNet_SolrPro')) {
+            return true;
+        }
         if (!$this->isKeyValid(Mage::getStoreConfig('integernet_solr/general/license_key'))) {
 
             if ($installTimestamp = Mage::getStoreConfig('integernet_solr/general/install_date')) {
diff --git a/src/app/code/community/IntegerNet/Solr/Model/Configuration.php b/src/app/code/community/IntegerNet/Solr/Model/Configuration.php
@@ -138,6 +138,10 @@ protected function _isModuleActive($storeId)
      */
     protected function _isModuleLicensed()
     {
+        if (!Mage::helper('core')->isModuleEnabled('IntegerNet_SolrPro')) {
+            return true;
+        }
+
         if (!trim(Mage::getStoreConfig('integernet_solr/general/license_key'))) {
 
             if ($installTimestamp = Mage::getStoreConfig('integernet_solr/general/install_date')) {

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,9 @@ public function isKeyValid($key)`
`63`	`63`	`*/`
`64`	`64`	`public function isLicensed()`
`65`	`65`	`{`
	`66`	`+ if (!Mage::helper('core')->isModuleEnabled('IntegerNet_SolrPro')) {`
	`67`	`+ return true;`
	`68`	`+ }`
`66`	`69`	`if (!$this->isKeyValid(Mage::getStoreConfig('integernet_solr/general/license_key'))) {`
`67`	`70`
`68`	`71`	`if ($installTimestamp = Mage::getStoreConfig('integernet_solr/general/install_date')) {`