From: Matthias Schmidt Date: Sat, 30 Jul 2016 14:13:41 +0000 (+0200) Subject: Replace PHP alias functions with aliased functions X-Git-Tag: 3.0.0_Beta_1~876 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=7ef4897fd790b772a37e66187f538648c8362289;p=GitHub%2FWoltLab%2FWCF.git Replace PHP alias functions with aliased functions --- diff --git a/wcfsetup/install/files/lib/system/setup/Installer.class.php b/wcfsetup/install/files/lib/system/setup/Installer.class.php index a4b8d62c16..124e02a207 100644 --- a/wcfsetup/install/files/lib/system/setup/Installer.class.php +++ b/wcfsetup/install/files/lib/system/setup/Installer.class.php @@ -63,7 +63,7 @@ class Installer { throw new SystemException("Could not create dir '".$this->targetDir."'"); } } - if (FileUtil::isApacheModule() || !is_writeable($this->targetDir)) { + if (FileUtil::isApacheModule() || !is_writable($this->targetDir)) { $this->makeWriteable($this->targetDir); } } @@ -82,7 +82,7 @@ class Installer { } umask($oldumask); } - if (FileUtil::isApacheModule() || !is_writeable($this->targetDir.$dir)) { + if (FileUtil::isApacheModule() || !is_writable($this->targetDir.$dir)) { $this->makeWriteable($this->targetDir.$dir); } } @@ -106,7 +106,7 @@ class Installer { */ protected function createFile($file, $index, Tar $tar) { $tar->extract($index, $this->targetDir.$file); - if (FileUtil::isApacheModule() || !is_writeable($this->targetDir.$file)) { + if (FileUtil::isApacheModule() || !is_writable($this->targetDir.$file)) { $this->makeWriteable($this->targetDir.$file); } } diff --git a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php index 70c6386ff1..baa38abe7c 100644 --- a/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php +++ b/wcfsetup/install/files/lib/system/style/StyleCompiler.class.php @@ -302,7 +302,7 @@ class StyleCompiler extends SingletonFactory { if (PACKAGE_ID) { foreach (Option::getOptions() as $constantName => $option) { if (in_array($option->optionType, static::$supportedOptionType)) { - $variables['wcf_option_'.mb_strtolower($constantName)] = (is_integer($option->optionValue)) ? $option->optionValue : '"'.$option->optionValue.'"'; + $variables['wcf_option_'.mb_strtolower($constantName)] = (is_int($option->optionValue)) ? $option->optionValue : '"'.$option->optionValue.'"'; } } } diff --git a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php index 407958ab14..b9d0c22ff8 100644 --- a/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php +++ b/wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php @@ -270,7 +270,7 @@ class TemplateScriptingCompiler { $compiledContent .= $textBlocks[$i].$compiledTags[$i]; } $compiledContent .= $textBlocks[$i]; - $compiledContent = chop($compiledContent); + $compiledContent = rtrim($compiledContent); // reinsert {literal} Tags $compiledContent = $this->reinsertLiterals($compiledContent);