First working commit

joomla · Aug 9, 2016 · 6903d53 · 6903d53
1 parent d3c9687
commit 6903d53
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 5 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1759,7 +1759,7 @@ public function convertTablesToNewNullDate($newNull=null,$oldNull=null)
 			{
 				foreach ($queries as $query)
 				{
-					$query = str_replace(array('#O#','#T#'), array($oldNull,$newNull), $query);
+					$query = str_replace(array('$O$','$T$'), array("'".$oldNull."'","'".$newNull."'"), $query);
 
 					try
 					{

diff --git a/administrator/components/com_admin/sql/others/mysql/nullDate-conversion.sql b/administrator/components/com_admin/sql/others/mysql/nullDate-conversion.sql
@@ -1,2 +1,2 @@
-ALTER TABLE `#__nullDate_conversion` CHANGE `converted` `converted` datetime NOT NULL DEFAULT #T#;
-UPDATE `#__nullDate_conversion` SET converted = #T#;
+ALTER TABLE `#__nullDate_conversion` CHANGE `converted` `converted` datetime NOT NULL DEFAULT $T$;
+UPDATE `#__nullDate_conversion` SET `converted` = $T$;
diff --git a/installation/model/database.php b/installation/model/database.php
@@ -652,6 +652,11 @@ public function createTables($options)
 			}
 		}
 
+		// Do the nullDate Conversion 
+		JLoader::register('JoomlaInstallerScript', JPATH_ADMINISTRATOR . '/components/com_admin/script.php');
+		$jinstallscript = new JoomlaInstallerScript;
+		$jinstallscript->convertTablesToNewNullDate();
+
 		// Handle default backend language setting. This feature is available for localized versions of Joomla.
 		$app = JFactory::getApplication();
 		$languages = $app->getLocaliseAdmin($db);

diff --git a/libraries/joomla/database/driver/mysqli.php b/libraries/joomla/database/driver/mysqli.php
@@ -988,10 +988,10 @@ private function serverClaimsUtf8mb4Support()
 	 *
 	 * @since   12.2
 	 */
-	private function serverUsesNewNullTime()
+	public function serverUsesNewNullTime()
 	{
 		$server_version = $this->getVersion();
-		return (version_compare($server_version, '5.7.0', '>='));
+		return version_compare($server_version, '5.7.0', '>=');
 	}
 
 	/**

diff --git a/libraries/joomla/database/driver/pdomysql.php b/libraries/joomla/database/driver/pdomysql.php
@@ -165,6 +165,21 @@ public static function isSupported()
 	{
 		return class_exists('PDO') && in_array('mysql', PDO::getAvailableDrivers());
 	}
+
+	/**
+	 * Does the database server uses the new null time (1000-01-01 00:00:00) instead of the old one (0000-00-00 00:00:00)
+	 *
+	 * libmysql uses the new null time since 5.7 (same version as the MySQL server).
+	 *
+	 * @return  boolean
+	 *
+	 * @since   12.2
+	 */
+	public function serverUsesNewNullTime()
+	{
+		return ($this->nullDate == "1000-01-01 00:00:00");
+	}
+
 
 	/**
 	 * Drops a table from the database.