dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
e14bb58
)
Merge "GitInfo: Suppress some wrong warnings"
author
jenkins-bot
<jenkins-bot@gerrit.wikimedia.org>
Fri, 7 Feb 2014 12:39:39 +0000
(12:39 +0000)
committer
Gerrit Code Review
<gerrit@wikimedia.org>
Fri, 7 Feb 2014 12:39:39 +0000
(12:39 +0000)
includes/GitInfo.php
patch
|
blob
|
history
diff --git
a/includes/GitInfo.php
b/includes/GitInfo.php
index
1f465c7
..
877c2d2
100644
(file)
--- a/
includes/GitInfo.php
+++ b/
includes/GitInfo.php
@@
-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 {
+ } else
if ( is_array( $configArray ) )
{
foreach ( $configArray as $sectionName => $sectionConf ) {
if ( substr( $sectionName, 0, 6 ) == 'remote' ) {
$remote = $sectionConf;