diff options
| -rw-r--r-- | phpBB/includes/diff/diff.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/functions_upload.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/search/base.php | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/diff/diff.php b/phpBB/includes/diff/diff.php index d4bd60c988..17fa726352 100644 --- a/phpBB/includes/diff/diff.php +++ b/phpBB/includes/diff/diff.php @@ -46,8 +46,8 @@ class diff /** * Computes diffs between sequences of strings. * - * @param array $from_lines An array of strings. Typically these are lines from a file. - * @param array $to_lines An array of strings. + * @param array $from_content An array of strings. Typically these are lines from a file. + * @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 */ function diff(&$from_content, &$to_content, $preserve_cr = true) diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php index 14d214ef71..be4bedd2ca 100644 --- a/phpBB/includes/functions_upload.php +++ b/phpBB/includes/functions_upload.php @@ -277,7 +277,7 @@ class filespec * Move file to destination folder * 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 $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()} diff --git a/phpBB/phpbb/search/base.php b/phpBB/phpbb/search/base.php index 90f11fc45a..f90abe10a8 100644 --- a/phpBB/phpbb/search/base.php +++ b/phpBB/phpbb/search/base.php @@ -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 $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 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 * must have the absolute index $start in the result set. * @param int $start indicates the first index of the page |