Completed
Pull Request — release-2.1 (#4844)
by Jeremy
08:41
created
other/upgrade.php 1 patch
Doc Comments   +16 added lines, -5 removed lines patch added patch discarded remove patch
@@ -502,6 +502,9 @@  discard block
 block discarded – undo
502 502
 }
503 503
 
504 504
 // Used to direct the user to another location.
505
+/**
506
+ * @param string $location
507
+ */
505 508
 function redirectLocation($location, $addForm = true)
506 509
 {
507 510
 	global $upgradeurl, $upcontext, $command_line;
@@ -1745,6 +1748,9 @@  discard block
 block discarded – undo
1745 1748
 	return addslashes(preg_replace(array('~^\.([/\\\]|$)~', '~[/]+~', '~[\\\]+~', '~[/\\\]$~'), array($install_path . '$1', '/', '\\', ''), $path));
1746 1749
 }
1747 1750
 
1751
+/**
1752
+ * @param string $filename
1753
+ */
1748 1754
 function parse_sql($filename)
1749 1755
 {
1750 1756
 	global $db_prefix, $db_collation, $boarddir, $boardurl, $command_line, $file_steps, $step_progress, $custom_warning;
@@ -1779,6 +1785,10 @@  discard block
 block discarded – undo
1779 1785
 
1780 1786
 	// Our custom error handler - does nothing but does stop public errors from XML!
1781 1787
 	set_error_handler(
1788
+
1789
+		/**
1790
+		 * @param string $errno
1791
+		 */
1782 1792
 		function ($errno, $errstr, $errfile, $errline) use ($support_js)
1783 1793
 		{
1784 1794
 			if ($support_js)
@@ -1993,6 +2003,9 @@  discard block
 block discarded – undo
1993 2003
 	return true;
1994 2004
 }
1995 2005
 
2006
+/**
2007
+ * @param string $string
2008
+ */
1996 2009
 function upgrade_query($string, $unbuffered = false)
1997 2010
 {
1998 2011
 	global $db_connection, $db_server, $db_user, $db_passwd, $db_type, $command_line, $upcontext, $upgradeurl, $modSettings;
@@ -4763,7 +4776,7 @@  discard block
 block discarded – undo
4763 4776
  * @param int $setSize The amount of entries after which to update the database.
4764 4777
  *
4765 4778
  * newCol needs to be a varbinary(16) null able field
4766
- * @return bool
4779
+ * @return boolean|null
4767 4780
  */
4768 4781
 function MySQLConvertOldIp($targetTable, $oldCol, $newCol, $limit = 50000, $setSize = 100)
4769 4782
 {
@@ -4931,9 +4944,8 @@  discard block
 block discarded – undo
4931 4944
  * settings file isn't using any advanced configuration setups in the Settings.php file.  A copy is made as Settings_org.php
4932 4945
  * to preserve all changes prior to migration.
4933 4946
  *
4934
- * @param array $config_vars An array of one or more variables to update
4935 4947
  *
4936
- * @return void We either succesfully update the Settings file, or throw a error here.
4948
+ * @return boolean|null We either succesfully update the Settings file, or throw a error here.
4937 4949
  */
4938 4950
 function migrateSettingsFile($changes)
4939 4951
 {
@@ -5343,9 +5355,8 @@  discard block
 block discarded – undo
5343 5355
  * Prior to checking these settings, we look for advanced setups such as integrations or if variables have been moved
5344 5356
  * to another file.  If these are detected, we abort.
5345 5357
  *
5346
- * @param array $config_vars An array of one or more variables to update
5347 5358
  *
5348
- * @return void We either succesfully update the Settings file, or throw a error here.
5359
+ * @return boolean We either succesfully update the Settings file, or throw a error here.
5349 5360
  */
5350 5361
 
5351 5362
 function detectSettingsFileMigrationNeeded()
Please login to merge, or discard this patch.