From 4879676bd159385c25411c15d935a63db0d5259a Mon Sep 17 00:00:00 2001 From: Matthias Schmidt Date: Mon, 21 Dec 2015 09:33:39 +0100 Subject: [PATCH] Remove obsolete parameters in method calls MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The removed parameters do not exist (anymore) in the called method’s signature. --- .../files/lib/acp/form/UserGroupAssignmentAddForm.class.php | 2 +- wcfsetup/install/files/lib/action/ImageProxyAction.class.php | 2 +- .../files/lib/data/attachment/AttachmentAction.class.php | 2 +- .../install/files/lib/data/language/LanguageEditor.class.php | 2 +- wcfsetup/install/files/lib/data/package/Package.class.php | 2 +- .../files/lib/data/user/avatar/UserAvatarAction.class.php | 4 ++-- .../files/lib/system/importer/UserAvatarImporter.class.php | 2 +- wcfsetup/install/files/lib/system/setup/Installer.class.php | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php index d72f3758f6..1101c60114 100644 --- a/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php +++ b/wcfsetup/install/files/lib/acp/form/UserGroupAssignmentAddForm.class.php @@ -95,7 +95,7 @@ class UserGroupAssignmentAddForm extends AbstractForm { return strcmp($groupA->getName(), $groupB->getName()); }); - $this->conditions = UserGroupAssignmentHandler::getInstance()->getGroupedObjectTypes('com.woltlab.wcf.condition.userGroupAssignment'); + $this->conditions = UserGroupAssignmentHandler::getInstance()->getGroupedObjectTypes(); parent::readData(); } diff --git a/wcfsetup/install/files/lib/action/ImageProxyAction.class.php b/wcfsetup/install/files/lib/action/ImageProxyAction.class.php index 7c31ac2355..3d17736a01 100644 --- a/wcfsetup/install/files/lib/action/ImageProxyAction.class.php +++ b/wcfsetup/install/files/lib/action/ImageProxyAction.class.php @@ -51,7 +51,7 @@ class ImageProxyAction extends AbstractAction { $fileLocation = WCF_DIR.'images/proxy/'.substr($fileName, 0, 2).'/'.$fileName.($fileExtension ? '.'.$fileExtension : ''); $dir = dirname($fileLocation); if (!@file_exists($dir)) { - FileUtil::makePath($dir, 0777); + FileUtil::makePath($dir); } // download image diff --git a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php index 03fbebf933..c0aed2f4a1 100644 --- a/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php +++ b/wcfsetup/install/files/lib/data/attachment/AttachmentAction.class.php @@ -164,7 +164,7 @@ class AttachmentAction extends AbstractDatabaseObjectAction { // and create subdirectory if necessary $dir = dirname($attachment->getLocation()); if (!@file_exists($dir)) { - FileUtil::makePath($dir, 0777); + FileUtil::makePath($dir); } // move uploaded file diff --git a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php index 881b2d9bfb..512ad34b2d 100644 --- a/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php +++ b/wcfsetup/install/files/lib/data/language/LanguageEditor.class.php @@ -455,7 +455,7 @@ class LanguageEditor extends DatabaseObjectEditor implements IEditableCachedObje } // update the relevant language files - self::deleteLanguageFiles($this->languageID, $category->languageCategory, $packageID); + self::deleteLanguageFiles($this->languageID, $category->languageCategory); // delete relevant template compilations $this->deleteCompiledTemplates(); diff --git a/wcfsetup/install/files/lib/data/package/Package.class.php b/wcfsetup/install/files/lib/data/package/Package.class.php index 86351a14fc..a88a5c4133 100644 --- a/wcfsetup/install/files/lib/data/package/Package.class.php +++ b/wcfsetup/install/files/lib/data/package/Package.class.php @@ -152,7 +152,7 @@ class Package extends DatabaseObject { } // check if package is required by another package - if (self::isRequired($this->packageID)) { + if ($this->isRequired()) { return false; } diff --git a/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php b/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php index c38908aba6..9e99710860 100644 --- a/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php +++ b/wcfsetup/install/files/lib/data/user/avatar/UserAvatarAction.class.php @@ -94,7 +94,7 @@ class UserAvatarAction extends AbstractDatabaseObjectAction { // and create subdirectory if necessary $dir = dirname($avatar->getLocation()); if (!@file_exists($dir)) { - FileUtil::makePath($dir, 0777); + FileUtil::makePath($dir); } // move uploaded file @@ -230,7 +230,7 @@ class UserAvatarAction extends AbstractDatabaseObjectAction { // and create subdirectory if necessary $dir = dirname($avatar->getLocation()); if (!@file_exists($dir)) { - FileUtil::makePath($dir, 0777); + FileUtil::makePath($dir); } // move uploaded file diff --git a/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php b/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php index 7818f47057..02e25cdbca 100644 --- a/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php +++ b/wcfsetup/install/files/lib/system/importer/UserAvatarImporter.class.php @@ -54,7 +54,7 @@ class UserAvatarImporter extends AbstractImporter { // and create subdirectory if necessary $dir = dirname($avatar->getLocation()); if (!@file_exists($dir)) { - FileUtil::makePath($dir, 0777); + FileUtil::makePath($dir); } // copy file diff --git a/wcfsetup/install/files/lib/system/setup/Installer.class.php b/wcfsetup/install/files/lib/system/setup/Installer.class.php index 825f4ee869..261110555b 100644 --- a/wcfsetup/install/files/lib/system/setup/Installer.class.php +++ b/wcfsetup/install/files/lib/system/setup/Installer.class.php @@ -61,7 +61,7 @@ class Installer { */ protected function createTargetDir() { if (!@is_dir($this->targetDir)) { - if (!FileUtil::makePath($this->targetDir, (FileUtil::isApacheModule() ? 0777 : 0755))) { + if (!FileUtil::makePath($this->targetDir)) { throw new SystemException("Could not create dir '".$this->targetDir."'"); } } -- 2.20.1