Replace PHP alias functions with aliased functions
authorMatthias Schmidt <gravatronics@live.com>
Sat, 30 Jul 2016 14:13:41 +0000 (16:13 +0200)
committerMatthias Schmidt <gravatronics@live.com>
Sat, 30 Jul 2016 14:29:38 +0000 (16:29 +0200)
wcfsetup/install/files/lib/system/setup/Installer.class.php
wcfsetup/install/files/lib/system/style/StyleCompiler.class.php
wcfsetup/install/files/lib/system/template/TemplateScriptingCompiler.class.php

index a4b8d62c16136377cf3fa8af98834affbaaaad3f..124e02a207739f7129044e0910c3500bd65ea61d 100644 (file)
@@ -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);
                }
        }
index 70c6386ff158ad39100de3babc4d203ff58f2b8e..baa38abe7cdbddce20ae51645b13d738bfbcff56 100644 (file)
@@ -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.'"';
                                }
                        }
                }
index 407958ab1416f684b77c0266714b39987027c163..b9d0c22ff8d7ed88ceb22de66e4b992c5f98334c 100644 (file)
@@ -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);