Modified code for travis compatibility Part 2

joomla · Aug 9, 2016 · ef038cf · ef038cf
1 parent 22fcc21
commit ef038cf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 16 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1688,8 +1688,9 @@ public function flushSessions()
     /**
 	 * Converts the site's database tables to the new null Date of mySQL 5.7. Can also be used as reverter
 	 *
-	 * @param   string  $oldNull  the old null date string
-     * @param   string  $newNull  the new null date string
+	 * @param   string  $newNull  the old null date string
+	 *
+     * @param   string  $oldNull  the new null date string
      *
 	 * @return  void
 	 *
@@ -1699,21 +1700,30 @@ public function convertTablesToNewNullDate($newNull=null,$oldNull=null)
     {
 	    $db = JFactory::getDbo();
 
-		//Possible Convert Back
-		if($db->serverUsesNewNullTime())
+		// Possible to Convert Back
+		if ($db->serverUsesNewNullTime())
 		{
-			if(is_null($newNull))
+			if (is_null($newNull))
+			{
 				$newNull='1000-01-01 00:00:00';
+			}
 
-			if(is_null($oldNull))
+			if (is_null($oldNull))
+			{
 				$oldNull='0000-00-00 00:00:00';
-		} else
+			}
+		} 
+		else 
 		{
-			if(is_null($oldNull))
+			if (is_null($oldNull))
+			{
 				$oldNull='1000-01-01 00:00:00';
+			}
 
-			if(is_null($newNull))
+			if (is_null($newNull))
+			{
 				$newNull='0000-00-00 00:00:00';
+			}
 		}
 
 		// This is only required for MySQL databases
@@ -1744,7 +1754,7 @@ public function convertTablesToNewNullDate($newNull=null,$oldNull=null)
 
 		if($convertedDB == $newNull)
 		{
-			//Already updated - nothing to do
+			// Already updated - nothing to do
 			return;
 		}
 
@@ -1759,7 +1769,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/installation/model/database.php b/installation/model/database.php
@@ -1031,7 +1031,7 @@ public function populateDatabase($db, $schema)
 				 */
 				if ($db->getNullDate())
 				{
-					$query = $db->convertNullDate($query,$db->getNullDate());
+					$query = $db->convertNullDate($query, $db->getNullDate());
 				}
 
 				/**

diff --git a/libraries/joomla/database/driver.php b/libraries/joomla/database/driver.php
@@ -873,14 +873,13 @@ public function getAlterTableCharacterSet($tableName)
 
 		return $queries;
 	}
-
-
+
 	/**
 	 * Automatically changes the null date in the Query File
 	 *
-	 * @param   string  $query  The query to convert
+	 * @param   string  $query  	The query to convert
 	 *
-	 * @param   string  $nullDate  The used nullDate
+	 * @param   string  $nullDate  	The used nullDate
 	 *
 	 * @return  string  The converted query
 	 */