More descriptive sanitized paths for file repo errors

[lhc/web/wiklou.git] / includes / filerepo / LocalRepo.php

diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 90b198c..b096ce0 100644 (file)
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -10,6 +10,21 @@ class LocalRepo extends FSRepo {
        var $fileFromRowFactory = array( 'LocalFile', 'newFromRow' );
        var $oldFileFromRowFactory = array( 'OldLocalFile', 'newFromRow' );
 
+       function __construct( $info ) {
+               parent::__construct( $info );
+
+               # Initialize simpleCleanPairs, to make errors less misleading
+               global $IP;
+               $this->simpleCleanPairs = array(
+                       $this->directory => '$wgUploadDirectory',
+                       wfTempDir() => '{wfTempDir()}',
+                       $IP => '$IP',
+               );
+               if ( $this->deletedDir ) {
+                       $this->simpleCleanPairs[$this->deletedDir] = '{$wgFileStore[\'deleted\'][\'directory\']}';
+               }
+       }
+
        function getSlaveDB() {
                return wfGetDB( DB_SLAVE );
        }