Merge pull request #7208 from nupplaphil/bug/6916-filetag

Adding null checks before FileTag method (fix fatal)
This commit is contained in:
Hypolite Petovan 2019-05-31 01:47:52 -04:00 committed by GitHub
commit f0de19dd8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions

View file

@ -133,7 +133,7 @@ class FileTag
* @return string A list of file tags.
* @deprecated since 2019.06 use arrayToFile() instead
*/
public static function listToFile($list, $type = 'file')
public static function listToFile(string $list, string $type = 'file')
{
$list_array = explode(',', $list);
@ -150,7 +150,7 @@ class FileTag
* @return string Comma delimited list of tag names.
* @deprecated since 2019.06 use fileToArray() instead
*/
public static function fileToList($file, $type = 'file')
public static function fileToList(string $file, $type = 'file')
{
return implode(',', self::fileToArray($file, $type));
}
@ -166,7 +166,7 @@ class FileTag
* @return boolean A value indicating success or failure.
* @throws \Exception
*/
public static function updatePconfig($uid, $file_old, $file_new, $type = 'file')
public static function updatePconfig(int $uid, string $file_old, string $file_new, string $type = 'file')
{
if (!intval($uid)) {
return false;