Completed
Pull Request — release-2.1 (#4470)
by Fran
10:39
created
other/upgrade.php 1 patch
Doc Comments   +14 added lines, -1 removed lines patch added patch discarded remove patch
@@ -489,6 +489,9 @@  discard block
 block discarded – undo
489 489
 	}
490 490
 
491 491
 // Used to direct the user to another location.
492
+/**
493
+ * @param string $location
494
+ */
492 495
 function redirectLocation($location, $addForm = true)
493 496
 {
494 497
 	global $upgradeurl, $upcontext, $command_line;
@@ -1711,6 +1714,9 @@  discard block
 block discarded – undo
1711 1714
 	return addslashes(preg_replace(array('~^\.([/\\\]|$)~', '~[/]+~', '~[\\\]+~', '~[/\\\]$~'), array($install_path . '$1', '/', '\\', ''), $path));
1712 1715
 }
1713 1716
 
1717
+/**
1718
+ * @param string $filename
1719
+ */
1714 1720
 function parse_sql($filename)
1715 1721
 {
1716 1722
 	global $db_prefix, $db_collation, $boarddir, $boardurl, $command_line, $file_steps, $step_progress, $custom_warning;
@@ -1745,6 +1751,10 @@  discard block
 block discarded – undo
1745 1751
 
1746 1752
 	// Our custom error handler - does nothing but does stop public errors from XML!
1747 1753
 	set_error_handler(
1754
+
1755
+		/**
1756
+		 * @param string $errno
1757
+		 */
1748 1758
 		function ($errno, $errstr, $errfile, $errline) use ($support_js)
1749 1759
 		{
1750 1760
 			if ($support_js)
@@ -1959,6 +1969,9 @@  discard block
 block discarded – undo
1959 1969
 	return true;
1960 1970
 }
1961 1971
 
1972
+/**
1973
+ * @param string $string
1974
+ */
1962 1975
 function upgrade_query($string, $unbuffered = false)
1963 1976
 {
1964 1977
 	global $db_connection, $db_server, $db_user, $db_passwd, $db_type, $command_line, $upcontext, $upgradeurl, $modSettings;
@@ -4712,7 +4725,7 @@  discard block
 block discarded – undo
4712 4725
  * @param int $setSize The amount of entries after which to update the database.
4713 4726
  *
4714 4727
  * newCol needs to be a varbinary(16) null able field
4715
- * @return bool
4728
+ * @return boolean|null
4716 4729
  */
4717 4730
 function MySQLConvertOldIp($targetTable, $oldCol, $newCol, $limit = 50000, $setSize = 100)
4718 4731
 {
Please login to merge, or discard this patch.