diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 10:46:14 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2015-09-09 10:46:14 +0200 |
| commit | 5f91f1cad85eaf7f8dc62a1a140605a46431496f (patch) | |
| tree | 48caee30b0971ac685e6cb206bd7ce5bf578d89d /phpBB | |
| parent | 70ad0c6a8f7d16b767aa78cde2acc9a3b3512e6f (diff) | |
| download | forums-5f91f1cad85eaf7f8dc62a1a140605a46431496f.tar forums-5f91f1cad85eaf7f8dc62a1a140605a46431496f.tar.gz forums-5f91f1cad85eaf7f8dc62a1a140605a46431496f.tar.bz2 forums-5f91f1cad85eaf7f8dc62a1a140605a46431496f.tar.xz forums-5f91f1cad85eaf7f8dc62a1a140605a46431496f.zip | |
[ticket/13904] Minor coding style fixes
PHPBB3-13904
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/files/factory.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/files/filespec.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/files/types/form.php | 12 | ||||
| -rw-r--r-- | phpBB/phpbb/files/types/local.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/files/types/remote.php | 10 | ||||
| -rw-r--r-- | phpBB/phpbb/files/types/type_interface.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/files/upload.php | 6 |
7 files changed, 22 insertions, 24 deletions
diff --git a/phpBB/phpbb/files/factory.php b/phpBB/phpbb/files/factory.php index 508c50c6ce..84b7cc9449 100644 --- a/phpBB/phpbb/files/factory.php +++ b/phpBB/phpbb/files/factory.php @@ -42,7 +42,7 @@ class factory { $service = false; - $name = (strpos($name, 'files.') === false) ? 'files.' . $name : $name; + $name = (strpos($name, '.') === false) ? 'files.' . $name : $name; try { diff --git a/phpBB/phpbb/files/filespec.php b/phpBB/phpbb/files/filespec.php index e171e7e68f..7a42e6bd50 100644 --- a/phpBB/phpbb/files/filespec.php +++ b/phpBB/phpbb/files/filespec.php @@ -13,7 +13,7 @@ namespace phpbb\files; -use \phpbb\language\language; +use phpbb\language\language; /** * Responsible for holding all file relevant information, as well as doing file-specific operations. @@ -201,8 +201,6 @@ class filespec * character. Unique creates a unique filename. * @param string $prefix Prefix applied to filename * @param string $user_id The user_id is only needed for when cleaning a user's avatar - * - *@access public */ public function clean_filename($mode = 'unique', $prefix = '', $user_id = '') { diff --git a/phpBB/phpbb/files/types/form.php b/phpBB/phpbb/files/types/form.php index 4cf340ee7d..832f090c47 100644 --- a/phpBB/phpbb/files/types/form.php +++ b/phpBB/phpbb/files/types/form.php @@ -13,12 +13,12 @@ namespace phpbb\files\types; -use \bantu\IniGetWrapper\IniGetWrapper; -use \phpbb\files\factory; -use \phpbb\files\filespec; -use \phpbb\language\language; -use \phpbb\plupload\plupload; -use \phpbb\request\request_interface; +use bantu\IniGetWrapper\IniGetWrapper; +use phpbb\files\factory; +use phpbb\files\filespec; +use phpbb\language\language; +use phpbb\plupload\plupload; +use phpbb\request\request_interface; class form extends base { diff --git a/phpBB/phpbb/files/types/local.php b/phpBB/phpbb/files/types/local.php index ff11890856..7e9210b196 100644 --- a/phpBB/phpbb/files/types/local.php +++ b/phpBB/phpbb/files/types/local.php @@ -13,11 +13,11 @@ namespace phpbb\files\types; -use \bantu\IniGetWrapper\IniGetWrapper; -use \phpbb\files\factory; -use \phpbb\files\filespec; -use \phpbb\language\language; -use \phpbb\request\request_interface; +use bantu\IniGetWrapper\IniGetWrapper; +use phpbb\files\factory; +use phpbb\files\filespec; +use phpbb\language\language; +use phpbb\request\request_interface; class local extends base { diff --git a/phpBB/phpbb/files/types/remote.php b/phpBB/phpbb/files/types/remote.php index 34ee97f1c9..44feab0ece 100644 --- a/phpBB/phpbb/files/types/remote.php +++ b/phpBB/phpbb/files/types/remote.php @@ -13,11 +13,11 @@ namespace phpbb\files\types; -use \bantu\IniGetWrapper\IniGetWrapper; -use \phpbb\files\factory; -use \phpbb\files\filespec; -use \phpbb\language\language; -use \phpbb\request\request_interface; +use bantu\IniGetWrapper\IniGetWrapper; +use phpbb\files\factory; +use phpbb\files\filespec; +use phpbb\language\language; +use phpbb\request\request_interface; class remote extends base { diff --git a/phpBB/phpbb/files/types/type_interface.php b/phpBB/phpbb/files/types/type_interface.php index adfbb75293..e07078349a 100644 --- a/phpBB/phpbb/files/types/type_interface.php +++ b/phpBB/phpbb/files/types/type_interface.php @@ -13,7 +13,7 @@ namespace phpbb\files\types; -use \phpbb\files\upload; +use phpbb\files\upload; interface type_interface { diff --git a/phpBB/phpbb/files/upload.php b/phpBB/phpbb/files/upload.php index bd379924e7..45ff1c372f 100644 --- a/phpBB/phpbb/files/upload.php +++ b/phpBB/phpbb/files/upload.php @@ -13,9 +13,9 @@ namespace phpbb\files; -use \phpbb\filesystem\filesystem_interface; -use \phpbb\language\language; -use \phpbb\request\request_interface; +use phpbb\filesystem\filesystem_interface; +use phpbb\language\language; +use phpbb\request\request_interface; /** * File upload class |