Title: Test the ->equals() method more thoughroughly

[lhc/web/wiklou.git] / includes / GitInfo.php

diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index 6270b27..e9e780d 100644 (file)
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -156,7 +156,7 @@ class GitInfo {
         * @return bool Whether or not the string looks like a SHA1
         */
        public static function isSHA1( $str ) {
-               return !!preg_match( '/^[0-9A-F]{40}$/i', $str );
+               return (bool)preg_match( '/^[0-9A-F]{40}$/i', $str );
        }
 
        /**
@@ -227,6 +227,7 @@ class GitInfo {
                        $date = false;
                        if ( is_file( $wgGitBin ) &&
                                is_executable( $wgGitBin ) &&
+                               !Shell::isDisabled() &&
                                $this->getHead() !== false
                        ) {
                                $cmd = [