Continued a bit:

- introduced doNormalBootstrap()
- First check for mysqli, then obsolete mysql

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/inc/mysql-connect.php b/inc/mysql-connect.php
index 1e596c3a8c56b986b07722250d84c044fece132b..513b391e660fe6599a383f9431136d7a7af1af3b 100644 (file)
--- a/inc/mysql-connect.php
+++ b/inc/mysql-connect.php
@@ -97,20 +97,8 @@ enableTemplateHtml();
 
 // Are we in installation phase?
 if ((!isInstaller()) && (isInstalled())) {
-       // Load configuration file(s) here
-       loadIncludeOnce('inc/load_config.php');
-
-       // Load database layer here
-       loadIncludeOnce('inc/db/lib.php');
-
-       // Init message system
-       initMessages();
-
-       // CSS array
-       initExtensionCssFiles();
-
-       // Initialize SQL link
-       initSqlLink();
+       // Regular bootstrap
+       doNormalBootstrap();
 } else {
        // Default output is 'direct' for HTML output
        setConfigEntry('OUTPUT_MODE', 'direct');
@@ -129,18 +117,18 @@ if ((!isInstaller()) && (isInstalled())) {
                // Then take it from session
                /* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Setting _DB_TYPE from session;database_extension=' . getSession('database_extension'));
                setConfigEntry('_DB_TYPE', getSession('database_extension'));
-       } elseif (isPhpExtensionLoaded('mysql')) {
-               // Debug message
-               /* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Setting _DB_TYPE to default (mysql) ...');
-
-               // Set (old) default
-               setConfigEntry('_DB_TYPE', 'mysql');
        } elseif (isPhpExtensionLoaded('mysqli')) {
                // Debug message
                /* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Setting _DB_TYPE to MySQLi ...');
 
                // Set (old) default
                setConfigEntry('_DB_TYPE', 'mysqli');
+       } elseif (isPhpExtensionLoaded('mysql')) {
+               // Debug message
+               /* DEBUG: */ logDebugMessage(__FILE__, __LINE__, 'Setting _DB_TYPE to default (mysql) ...');
+
+               // Set (old) default
+               setConfigEntry('_DB_TYPE', 'mysql');
        } else {
                // Opps, cannot detect it?
                reportBug(__FILE__, __LINE__, 'Cannot detect mysql/mysqli. Please fix your setup.');

diff --git a/inc/purge/purge-tasks.php b/inc/purge/purge-tasks.php
index 2341ea145e9d931518622a7ebd53509333c5da26..b8aa028d025f3d906b6ca10c9e2d5e2738e529f9 100644 (file)
--- a/inc/purge/purge-tasks.php
+++ b/inc/purge/purge-tasks.php
@@ -61,7 +61,9 @@ FROM
        `{?_MYSQL_PREFIX?}_task_system`
 WHERE
        `status`='DELETED' AND
-       (UNIX_TIMESTAMP() - `task_created`) >= {?ap_tasks_time?}", __FILE__, __LINE__);
+       (UNIX_TIMESTAMP() - `task_created`) >= {?ap_tasks_time?}
+ORDER BY
+       `id` ASC", __FILE__, __LINE__);
 
        // Send out a notification?
        if (!ifSqlHasZeroNumRows($result)) {

diff --git a/inc/wrapper-functions.php b/inc/wrapper-functions.php
index 3f7f91ed1166c5cfc01c3e6908454695abe62dcd..4ac0eeeffbab122a10d0e04f347e76181aa18d23 100644 (file)
--- a/inc/wrapper-functions.php
+++ b/inc/wrapper-functions.php
@@ -3606,5 +3606,23 @@ function setSessionCompiled ($key, $value) {
        return setSession($key, $value);
 }
 
+// Does normal bootstrap
+function doNormalBootstrap () {
+       // Load configuration file(s) here
+       loadIncludeOnce('inc/load_config.php');
+
+       // Load database layer here
+       loadIncludeOnce('inc/db/lib.php');
+
+       // Init message system
+       initMessages();
+
+       // CSS array
+       initExtensionCssFiles();
+
+       // Initialize SQL link
+       initSqlLink();
+}
+
 // [EOF]
 ?>