dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9c84094
)
Installer can handle exceptions now, also suppress possible permission errors with...
author
Chad Horohoe
<demon@users.mediawiki.org>
Fri, 17 Dec 2010 15:40:08 +0000
(15:40 +0000)
committer
Chad Horohoe
<demon@users.mediawiki.org>
Fri, 17 Dec 2010 15:40:08 +0000
(15:40 +0000)
includes/db/Database.php
patch
|
blob
|
history
diff --git
a/includes/db/Database.php
b/includes/db/Database.php
index
6aaa7ae
..
5b6254a
100644
(file)
--- a/
includes/db/Database.php
+++ b/
includes/db/Database.php
@@
-2398,13
+2398,12
@@
abstract class DatabaseBase implements DatabaseType {
* using $filename
*/
function sourceFile( $filename, $lineCallback = false, $resultCallback = false, $fname = false ) {
+ wfSuppressWarnings();
$fp = fopen( $filename, 'r' );
+ wfRestoreWarnings();
if ( false === $fp ) {
- if ( !defined( "MEDIAWIKI_INSTALL" ) )
- throw new MWException( "Could not open \"{$filename}\".\n" );
- else
- return "Could not open \"{$filename}\".\n";
+ throw new MWException( "Could not open \"{$filename}\".\n" );
}
if ( !$fname ) {