Fix code style issues

diff --git a/CodeSniff/WCF/ruleset.xml b/CodeSniff/WCF/ruleset.xml
index 4ad1180e84516b324a94c62cdd961a9006c643e6..3bce68139f2302e8602363cc0f5627a31a80af6b 100644 (file)
--- a/CodeSniff/WCF/ruleset.xml
+++ b/CodeSniff/WCF/ruleset.xml
@@ -21,7 +21,6 @@
        <rule ref="Generic.Functions.FunctionCallArgumentSpacing" />
        <rule ref="Generic.NamingConventions.UpperCaseConstantName" />
        <rule ref="Generic.PHP.CharacterBeforePHPOpeningTag" />
-       <rule ref="Generic.PHP.DisallowShortOpenTag" />
        <rule ref="Generic.PHP.LowerCaseConstant" />
        <rule ref="Generic.PHP.LowerCaseKeyword" />
        <rule ref="Generic.WhiteSpace.DisallowSpaceIndent" />

diff --git a/wcfsetup/test.php b/wcfsetup/test.php
index a01fc5d262868756709fe1f4f89a5a6baf4f3785..7714702e6b5c597afd6fdc10d571cbcf4f2c8301 100644 (file)
--- a/wcfsetup/test.php
+++ b/wcfsetup/test.php
@@ -370,7 +370,7 @@ function checkInstallFile() {
                        
                        <?php if (extension_loaded('imagick')) { ?>
                                <li class="success"><?=getPhrase('php_extension_success', ['Imagick'])?></li>
-                       <?php } elseif (extension_loaded('gd')) { ?>
+                       <?php } else if (extension_loaded('gd')) { ?>
                                <li class="success"><?=getPhrase('php_extension_success', ['GD'])?></li>
                        <?php } else { ?>       
                                <li class="failure"><?=getPhrase('php_extension_gd_or_imagick_failure')?></li>