Ticket #2953: mythweb-dl.diff

includes/objects/Database_mysql.php

@@ -43 +43 @@
  * @param string $port         Port or socket address to connect to
 /**/
     function __construct($db_name, $login, $password, $server='localhost', $port=NULL, $options=NULL) {
+    // Attempt to make sure the extension is loaded
+        if (!extension_loaded('mysql')) {
+        // This function is deprecated as of php5, so we see if we can use it
+            if (function_exists('dl')) {
+            // Attempt to allow dl to be used
+                ini_set('enable_dl', TRUE);
+                if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+                    dl('php_mysql.dll');
+                else
+                    dl('mysql.so');
+            }
+        }
     // Connect to the database
         $this->dbh = @mysql_connect($port ? "$server:$port" : $server, $login, $password)
             or $this->error("Can't connect to the database server.");

includes/objects/Database_mysqli_compat.php

@@ -50 +50 @@
  * @param string $port      Port or socket address to connect to
 /**/
     function __construct($db_name, $login, $password, $server='localhost', $port=NULL) {
+    // Attempt to make sure the extension is loaded
+        if (!extension_loaded('mysql')) {
+        // This function is deprecated as of php5, so we see if we can use it
+            if (function_exists('dl')) {
+            // Attempt to allow dl to be used
+                ini_set('enable_dl', TRUE);
+                if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN')
+                    dl('php_mysql.dll');
+                else
+                    dl('mysql.so');
+            }
+        }
     // Connect to the database
         $this->dbh = @mysqli_connect($server, $login, $password, NULL, $port)
             or $this->error("Can't connect to the database server.");