From 39cd29d91eaf4625e009aedeeaa2b51cb275c696 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 8 Jan 2008 22:01:23 +0000 Subject: [PATCH] Revert r29361 -- breaks upload, calls nonexistent functions --- includes/filerepo/FSRepo.php | 11 +++-------- includes/filerepo/RepoGroup.php | 7 ------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php index acffb4b582..84ec9a2709 100644 --- a/includes/filerepo/FSRepo.php +++ b/includes/filerepo/FSRepo.php @@ -149,7 +149,7 @@ class FSRepo extends FileRepo { // In the deleted zone, seed new directories with a blank // index.html, to prevent crawling if ( $dstZone == 'deleted' ) { - $this->file_put_contents( "$dstDir/index.html", '' ); + file_put_contents( "$dstDir/index.html", '' ); } } @@ -189,7 +189,7 @@ class FSRepo extends FileRepo { if ( $flags & self::DELETE_SOURCE ) { if ( $deleteDest ) { - $this->unlink( $dstPath ); + unlink( $dstPath ); } if ( !rename( $srcPath, $dstPath ) ) { $status->error( 'filerenameerror', $srcPath, $dstPath ); @@ -202,7 +202,7 @@ class FSRepo extends FileRepo { } } if ( $good ) { - $this->chmod( $dstPath, 0644 ); + chmod( $dstPath, 0644 ); $status->successCount++; } else { $status->failCount++; @@ -525,11 +525,6 @@ class FSRepo extends FileRepo { return strtr( $param, $this->simpleCleanPairs ); } - function file_put_contents( $fileName, $contents ) { - file_put_contents( $fileName, $contents ); - } - - } diff --git a/includes/filerepo/RepoGroup.php b/includes/filerepo/RepoGroup.php index 4e9a8a6dc6..1204031fd0 100644 --- a/includes/filerepo/RepoGroup.php +++ b/includes/filerepo/RepoGroup.php @@ -31,13 +31,6 @@ class RepoGroup { self::$instance = null; } - /** - * Set the singleton instance to a given object - */ - static function setSingleton( $instance ) { - self::$instance = $instance; - } - /** * Construct a group of file repositories. * @param array $data Array of repository info arrays. -- 2.20.1