Better checks + always return FALSE on abort

diff --git a/inc/extensions/ext-debug.php b/inc/extensions/ext-debug.php
index 6db2f71dde0ec09bf9c7670d59c48461eb446f12..b5b25217c2dde3d603bb38b8d31af45923611e58 100644 (file)
--- a/inc/extensions/ext-debug.php
+++ b/inc/extensions/ext-debug.php
@@ -61,7 +61,7 @@ switch (getExtensionMode()) {
 `sender_id` BIGINT(20) UNSIGNED NOT NULL DEFAULT 0,
 `timestamp` TIMESTAMP NOT NULL DEFAULT '0000-00-00 00:00',
 `file` VARCHAR(255) NOT NULL DEFAULT '',
-`line` MEDIUMINT NOT NOT NULL DEFAULT 0,
+`line` MEDIUMINT NOT NULL DEFAULT 0,
 `message` LONGTEXT NOT NULL,
 `comment` TINYTEXT NOT NULL,
 `status` ENUM('NEW','PENDING','ACCEPTED','FIXED','INVALID','DUBLICATE','SPAM') NOT NULL DEFAULT 'NEW',

diff --git a/inc/loader/load- b/inc/loader/load-
index eca6dfd929a548ec618a165ff61f6a9c183332d5..aeedfc5dbe349059dce4a84b1759ff7fb2fc9604 100644 (file)
--- a/inc/loader/load-
+++ b/inc/loader/load-
@@ -40,7 +40,7 @@ if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
        // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       return FALSE;
 }
 
 // Let's start with the admins table...

diff --git a/inc/loader/load-admins.php b/inc/loader/load-admins.php
index e3b5663ed209ef87de256bac418460ccfbfd0406..d422c046f8c042e74a685cdef2cb7e46d69b86a7 100644 (file)
--- a/inc/loader/load-admins.php
+++ b/inc/loader/load-admins.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Let's start with the admins table...

diff --git a/inc/loader/load-config.php b/inc/loader/load-config.php
index e6bb7580a5f9a0828bb7cd60bd52a59b17d56d44..384dbef0bca855ba9874a2ac7a692fb9beeffa7e 100644 (file)
--- a/inc/loader/load-config.php
+++ b/inc/loader/load-config.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the configuration (config)...

diff --git a/inc/loader/load-earning.php b/inc/loader/load-earning.php
index 3a809ce0bd8673e4d4fb69e5eb146ab1bbc228f2..18180aca1ab4493d91df47d0aecd3de88efae270 100644 (file)
--- a/inc/loader/load-earning.php
+++ b/inc/loader/load-earning.php
@@ -39,8 +39,11 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
+} elseif (!isExtensionInstalled('earning')) {
+       // Do not cache if not installed!
+       return FALSE;
 }
 
 // Let's start with the admins table...

diff --git a/inc/loader/load-extension.php b/inc/loader/load-extension.php
index 791e6476169f219810f2aeda5661a8b27d78f92f..0a1f3c572640459f17e4bd343381c63673918ec1 100644 (file)
--- a/inc/loader/load-extension.php
+++ b/inc/loader/load-extension.php
@@ -41,8 +41,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the extension

diff --git a/inc/loader/load-filter.php b/inc/loader/load-filter.php
index 7789ef963b1c167b1b86850a26de825a062476e6..37566647c21c06f812ecb78afbdbe0a965a05da1 100644 (file)
--- a/inc/loader/load-filter.php
+++ b/inc/loader/load-filter.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the filteruration (filter)...

diff --git a/inc/loader/load-imprint.php b/inc/loader/load-imprint.php
index ab2f389025d3a3dc8f7982b30b0cd4e0e8b856a5..eb1d818d81a58189caca0f8382d0c7823615fdf9 100644 (file)
--- a/inc/loader/load-imprint.php
+++ b/inc/loader/load-imprint.php
@@ -39,11 +39,11 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 } elseif (!isExtensionInstalled('imprint')) {
-       // Not not cache if not installed!
-       return;
+       // Do not cache if not installed!
+       return FALSE;
 }
 
 // Let's start with the admins table...

diff --git a/inc/loader/load-modules.php b/inc/loader/load-modules.php
index 382bf528592de7490d48465efc0ee847f90f2345..c6027de079594f50b7e5e706d7e671ec452a5dbb 100644 (file)
--- a/inc/loader/load-modules.php
+++ b/inc/loader/load-modules.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the module registry (mod_reg)...

diff --git a/inc/loader/load-payments.php b/inc/loader/load-payments.php
index 8383a50411153213c49726143b317fc1bb293f23..6a6ce9d68c4134ab718591fce2640b92a0293a24 100644 (file)
--- a/inc/loader/load-payments.php
+++ b/inc/loader/load-payments.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Let's start with the admins table...

diff --git a/inc/loader/load-points_data.php b/inc/loader/load-points_data.php
index 90fa77f52e29a4d4a67394886e0165b48115c903..9d496e5ad17795c9476b7933673cab742565ac7b 100644 (file)
--- a/inc/loader/load-points_data.php
+++ b/inc/loader/load-points_data.php
@@ -39,8 +39,11 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
+} elseif (!isExtensionInstalledAndNewer('sql_patches', '0.8.0')) {
+       // Is not installed or recent enough
+       return FALSE;
 }
 
 // Let's start with the admins table...

diff --git a/inc/loader/load-refdepths.php b/inc/loader/load-refdepths.php
index 82522aad10987d64637a609bce54d8023ac69bda..cff0a33e1fcab782fbd9a7e3ad015973432384d0 100644 (file)
--- a/inc/loader/load-refdepths.php
+++ b/inc/loader/load-refdepths.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the referral system (refdepths)...

diff --git a/inc/loader/load-refsystem.php b/inc/loader/load-refsystem.php
index 9be26d680796282728aca384f0d59e6c3e29c44b..dab0a40d145960ef2fe0d30646c5dac61a7a112a 100644 (file)
--- a/inc/loader/load-refsystem.php
+++ b/inc/loader/load-refsystem.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 }
 
 // Next cached table is the referral system (refsystem)...

diff --git a/inc/loader/load-themes.php b/inc/loader/load-themes.php
index 3613f7232db82ea4d61665d4667d67f72218664c..123d538d8da9221a8223b40b0e5ab0c0ef4d43c3 100644 (file)
--- a/inc/loader/load-themes.php
+++ b/inc/loader/load-themes.php
@@ -39,8 +39,8 @@
 if (!defined('__SECURITY')) {
        die();
 } elseif (isInstallationPhase()) {
-       // Use this code if you don't want to run this cache loader on installation phase
-       return;
+       // Do not run in installation phase
+       return FALSE;
 } elseif (!isExtensionActive('theme')) {
        // Skip this loader
        return FALSE;