* (bug 7324) Fix error message for failure of Database::sourceFile()

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0d83d14..144ef9a 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -204,6 +204,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   that force edits by non-bot users to bot mode
 * Set Vary: Cookie on action=raw generated CSS and JS, to ensure that user
   preferences don't get stuck in proxy caches for other people
+* (bug 7324) Fix error message for failure of Database::sourceFile()
 
 
 == Languages updated ==

diff --git a/includes/Database.php b/includes/Database.php
index afd0806..eaecc1a 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -1902,7 +1902,7 @@ class Database {
        function sourceFile( $filename ) {
                $fp = fopen( $filename, 'r' );
                if ( false === $fp ) {
-                       return "Could not open \"{$fname}\".\n";
+                       return "Could not open \"{$filename}\".\n";
                }
 
                $cmd = "";