X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGitInfo.php;h=14f3cc14afee02ab895a74412fe865d7026dec67;hb=2c085ac5a3c8020958d52554e13317feef30ffaf;hp=7052820e1d8977500dcdf3de96021712eaba768a;hpb=a8b5e408bf8df6a02d18c70ad22ec14f2333abd4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GitInfo.php b/includes/GitInfo.php
index 7052820e1d..14f3cc14af 100644
--- a/includes/GitInfo.php
+++ b/includes/GitInfo.php
@@ -96,7 +96,7 @@ class GitInfo {
 	 *
 	 * @param string $repoDir The root directory of the repo where .git can be found
 	 * @return string Path to GitInfo cache file in $wgGitInfoCacheDirectory or
-	 * null if $wgGitInfoCacheDirectory is false (cache disabled).
+	 * fallback in the extension directory itself
 	 * @since 1.24
 	 */
 	protected static function getCacheFilePath( $repoDir ) {
@@ -119,9 +119,13 @@ class GitInfo {
 			// a filename
 			$repoName = strtr( $repoName, DIRECTORY_SEPARATOR, '-' );
 			$fileName = 'info' . $repoName . '.json';
-			return "{$wgGitInfoCacheDirectory}/{$fileName}";
+			$cachePath = "{$wgGitInfoCacheDirectory}/{$fileName}";
+			if ( is_readable( $cachePath ) ) {
+				return $cachePath;
+			}
 		}
-		return null;
+
+		return "$repoDir/gitinfo.json";
 	}
 
 	/**
@@ -281,9 +285,9 @@ class GitInfo {
 			$config = "{$this->basedir}/config";
 			$url = false;
 			if ( is_readable( $config ) ) {
-				wfSuppressWarnings();
+				MediaWiki\suppressWarnings();
 				$configArray = parse_ini_file( $config, true );
-				wfRestoreWarnings();
+				MediaWiki\restoreWarnings();
 				$remote = false;
 
 				// Use the "origin" remote repo if available or any other repo if not.
@@ -392,7 +396,7 @@ class GitInfo {
 
 		if ( self::$viewers === false ) {
 			self::$viewers = $wgGitRepositoryViewers;
-			wfRunHooks( 'GitViewers', array( &self::$viewers ) );
+			Hooks::run( 'GitViewers', array( &self::$viewers ) );
 		}
 
 		return self::$viewers;