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

[ticket/16271] Fix sami parse errors in master

Browse source 
PHPBB3-16271
This commit is contained in:
Marc Alexander 2019-12-29 11:01:10 +01:00
parent 224b8d5494
commit 56476ed7ee
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/acp/acp_storage.php
View file

@ -192,7 +192,7 @@ class acp_storage
/** /**
* Get the current provider from config * Get the current provider from config
* *
* @param string $key Storage name * @param string $storage_name Storage name
* @return string The current provider * @return string The current provider
*/ */
protected function get_current_provider($storage_name) protected function get_current_provider($storage_name)
@ -203,7 +203,7 @@ class acp_storage
/** /**
* Get the new provider from the request * Get the new provider from the request
* *
* @param string $key Storage name * @param string $storage_name Storage name
* @return string The new provider * @return string The new provider
*/ */
protected function get_new_provider($storage_name) protected function get_new_provider($storage_name)

1
phpBB/phpbb/attachment/upload.php
View file

@ -84,6 +84,7 @@ class upload
* @param guesser $mimetype_guesser * @param guesser $mimetype_guesser
* @param dispatcher $phpbb_dispatcher * @param dispatcher $phpbb_dispatcher
* @param plupload $plupload * @param plupload $plupload
* @param storage $storage
* @param temp $temp * @param temp $temp
* @param user $user * @param user $user
*/ */

1
phpBB/phpbb/files/filespec_storage.php
View file

@ -382,6 +382,7 @@ class filespec_storage
/** /**
* Move file to destination folder * Move file to destination folder
* *
* @param \phpbb\storage\storage $storage
* @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
* *