makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12557] Fix doc block errors found by Sami

Browse source 
More corrections.

PHPBB3-12557
This commit is contained in:
n-aleha 2014-05-19 05:50:29 +03:00
parent 19b9df7e63
commit 8ac8c9ec61
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/diff/diff.php
View file

@ -46,8 +46,8 @@ class diff
/** /**
* Computes diffs between sequences of strings. * Computes diffs between sequences of strings.
* *
* @param array $from_lines An array of strings. Typically these are lines from a file. * @param array $from_content An array of strings. Typically these are lines from a file.
* @param array $to_lines An array of strings. * @param array $to_content An array of strings.
* @param bool $preserve_cr If true, \r is replaced by a new line in the diff output * @param bool $preserve_cr If true, \r is replaced by a new line in the diff output
*/ */
function diff(&$from_content, &$to_content, $preserve_cr = true) function diff(&$from_content, &$to_content, $preserve_cr = true)

2
phpBB/includes/functions_upload.php
View file

@ -277,7 +277,7 @@ class filespec
* Move file to destination folder * Move file to destination folder
* The phpbb_root_path variable will be applied to the destination path * The phpbb_root_path variable will be applied to the destination path
* *
* @param string $destination_path Destination path, for example $config['avatar_path'] * @param string $destination Destination path, for example $config['avatar_path']
* @param bool $overwrite If set to true, an already existing file will be overwritten * @param bool $overwrite If set to true, an already existing file will be overwritten
* @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped * @param bool $skip_image_check If set to true, the check for the file to be a valid image is skipped
* @param string $chmod Permission mask for chmodding the file after a successful move. The mode entered here reflects the mode defined by {@link phpbb_chmod()} * @param string $chmod Permission mask for chmodding the file after a successful move. The mode entered here reflects the mode defined by {@link phpbb_chmod()}

1
phpBB/phpbb/search/base.php
View file

@ -167,6 +167,7 @@ class base
* @param string $search_key an md5 string generated from all the passed search options to identify the results * @param string $search_key an md5 string generated from all the passed search options to identify the results
* @param string $keywords contains the keywords as entered by the user * @param string $keywords contains the keywords as entered by the user
* @param array $author_ary an array of author ids, if the author should be ignored during the search the array is empty * @param array $author_ary an array of author ids, if the author should be ignored during the search the array is empty
* @param int $result_count contains the number of all results for the search (not only for the current page)
* @param array &$id_ary contains a list of post or topic ids that shall be cached, the first element * @param array &$id_ary contains a list of post or topic ids that shall be cached, the first element
* must have the absolute index $start in the result set. * must have the absolute index $start in the result set.
* @param int $start indicates the first index of the page * @param int $start indicates the first index of the page