X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGitInfo.php;h=877c2d24e515f3dbd3aa947c58215e26ec78ee9a;hb=886fdc3ef3f50dc0f959c6dd60f93418d5a2ddd3;hp=e0bd5cd04316d878b1b93718046f684f1b80ef62;hpb=ddff639b7566f72f0c2dda302280de2ee6774b7f;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index e0bd5cd043..877c2d24e5 100644
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -44,13 +44,13 @@ class GitInfo {
 	 * @param string $dir The root directory of the repo where the .git dir can be found
 	 */
 	public function __construct( $dir ) {
-		$this->basedir = "{$dir}/.git";
+		$this->basedir = $dir . DIRECTORY_SEPARATOR . '.git';
 		if ( is_readable( $this->basedir ) && !is_dir( $this->basedir ) ) {
 			$GITfile = file_get_contents( $this->basedir );
 			if ( strlen( $GITfile ) > 8 && substr( $GITfile, 0, 8 ) === 'gitdir: ' ) {
 				$path = rtrim( substr( $GITfile, 8 ), "\r\n" );
 				$isAbsolute = $path[0] === '/' || substr( $path, 1, 1 ) === ':';
-				$this->basedir = $isAbsolute ? $path : "{$dir}/{$path}";
+				$this->basedir = $isAbsolute ? $path : $dir . DIRECTORY_SEPARATOR . $path;
 			}
 		}
 	}
@@ -169,13 +169,15 @@ class GitInfo {
 			return false;
 		}
 
+		wfSuppressWarnings();
 		$configArray = parse_ini_file( $config, true );
+		wfRestoreWarnings();
 		$remote = false;
 
 		// Use the "origin" remote repo if available or any other repo if not.
 		if ( isset( $configArray['remote origin'] ) ) {
 			$remote = $configArray['remote origin'];
-		} else {
+		} elseif ( is_array( $configArray ) ) {
 			foreach ( $configArray as $sectionName => $sectionConf ) {
 				if ( substr( $sectionName, 0, 6 ) == 'remote' ) {
 					$remote = $sectionConf;