Remove fatal error on lack of memory

jigoshop · Jul 21, 2014 · a6400d2 · a6400d2
1 parent a2eb0dc
commit a6400d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## Changelog
 
+* 1.10.2 - 2014-07-21:
+    * Fix: Memory check is not a fatal error anymore - plugin will continue to work.
+    * Fix: As memory is not a fatal error - required memory is downgraded to 64 MB. 
 * 1.10.1 - 2014-07-21:
     * Fix: Memory checking for some users. Thanks to freyaluna for finding it.
 * 1.10 - 2014-07-21:

diff --git a/jigoshop.php b/jigoshop.php
@@ -20,7 +20,7 @@
  * Description:         Jigoshop, a WordPress eCommerce plugin that works.
  * Author:              Jigoshop
  * Author URI:          http://www.jigoshop.com
- * Version:             1.10.1
+ * Version:             1.10.2
  * Requires at least:   3.8
  * Tested up to:        3.9.1
  * Text Domain:         jigoshop
@@ -55,7 +55,7 @@
 if (!defined('JIGOSHOP_URL')) {
 	define('JIGOSHOP_URL', plugins_url('', __FILE__));
 }
-define('JIGOSHOP_REQUIRED_MEMORY', 128);
+define('JIGOSHOP_REQUIRED_MEMORY', 64);
 define('JIGOSHOP_PHP_VERSION', '5.3');
 define('JIGOSHOP_WORDPRESS_VERSION', '3.8');
 
@@ -99,7 +99,6 @@ function jigoshop_required_version(){
 			sprintf(__('<strong>Error!</strong> Jigoshop requires at least %sM of memory! Your system currently has: %s.', 'jigoshop'), JIGOSHOP_REQUIRED_MEMORY, $ini_memory_limit).
 			'</p></div>';
 	});
-	return;
 }
 
 /**

diff --git a/readme.txt b/readme.txt
@@ -3,7 +3,7 @@ Contributors: Jigoshop
 Tags: ecommerce, wordpress ecommerce, store, shop, shopping, cart, checkout, widgets, reports, shipping, tax, paypal, jigoshop, shipping, inventory, stock, online, sell, sales, weights, dimensions, configurable, variable, downloadable, external, affiliate, download, virtual, physical
 Requires at least: 3.8
 Tested up to: 3.9.1
-Stable tag: 1.10.1
+Stable tag: 1.10.2
 
 A feature-packed eCommerce plugin built upon WordPress core functionality ensuring excellent performance and customizability.
 
@@ -113,6 +113,10 @@ However, if you want priority, dedicated support from Jigoshop staff, we dp offe
 
 == Changelog ==
 
+= 1.10.2 - 2014-07-21 =
+* Fix: Memory check is not a fatal error anymore - plugin will continue to work.
+* Fix: As memory is not a fatal error - required memory is downgraded to 64 MB.
+
 = 1.10.1 - 2014-07-21 =
 * Fix: Memory checking for some users. Thanks to freyaluna for finding it.