Modified code for travis compatibility Part 4

joomla · Aug 9, 2016 · a55bc16 · a55bc16
1 parent a8d612e
commit a55bc16
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
@@ -1690,8 +1690,8 @@ public function flushSessions()
 	 *
 	 * @param   string  $newNull  the old null date string
 	 *
-	 * @param   string  $oldNull  the new null date string
-	 *
+     * @param   string  $oldNull  the new null date string
+     *
 	 * @return  void
 	 *
 	 * @since   12.2
@@ -1752,7 +1752,7 @@ public function convertTablesToNewNullDate($newNull=null,$oldNull=null)
 			return;
 		}
 
-		if($convertedDB == $newNull)
+		if ($convertedDB == $newNull)
 		{
 			// Already updated - nothing to do
 			return;

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