Merge commit 'fa89acd'

# Conflicts:
#	.gitignore
#	extensions/ArchInterWiki.sql

1 files changed, 4 insertions, 4 deletions

diff --git a/includes/cache/CacheDependency.php b/includes/cache/CacheDependency.php
index 517f3798..2abcabdc 100644
--- a/includes/cache/CacheDependency.php
+++ b/includes/cache/CacheDependency.php
@@ -181,11 +181,11 @@ class FileDependency extends CacheDependency {
 
 	function loadDependencyValues() {
 		if ( is_null( $this->timestamp ) ) {
-			wfSuppressWarnings();
+			MediaWiki\suppressWarnings();
 			# Dependency on a non-existent file stores "false"
 			# This is a valid concept!
 			$this->timestamp = filemtime( $this->filename );
-			wfRestoreWarnings();
+			MediaWiki\restoreWarnings();
 		}
 	}
 
@@ -193,9 +193,9 @@ class FileDependency extends CacheDependency {
 	 * @return bool
 	 */
 	function isExpired() {
-		wfSuppressWarnings();
+		MediaWiki\suppressWarnings();
 		$lastmod = filemtime( $this->filename );
-		wfRestoreWarnings();
+		MediaWiki\restoreWarnings();
 		if ( $lastmod === false ) {
 			if ( $this->timestamp === false ) {
 				# Still nonexistent