Merge "(bug 42337) Simplify "my talk" link logic in personal tools"

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

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index e7a1545..635cb95 100644 (file)
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -2,6 +2,21 @@
 /**
  * A repository for files accessible via the local filesystem.
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  * @ingroup FileRepo
  */
@@ -9,13 +24,18 @@
 /**
  * A repository for files accessible via the local filesystem.
  * Does not support database access or registration.
- * 
+ *
  * This is a mostly a legacy class. New uses should not be added.
- * 
+ *
  * @ingroup FileRepo
  * @deprecated since 1.19
  */
 class FSRepo extends FileRepo {
+
+       /**
+        * @param $info array
+        * @throws MWException
+        */
        function __construct( array $info ) {
                if ( !isset( $info['backend'] ) ) {
                        // B/C settings...
@@ -30,15 +50,16 @@ class FSRepo extends FileRepo {
                                ? $info['fileMode']
                                : 0644;
 
+                       $repoName = $info['name'];
                        // Get the FS backend configuration
                        $backend = new FSFileBackend( array(
                                'name'           => $info['name'] . '-backend',
                                'lockManager'    => 'fsLockManager',
                                'containerPaths' => array(
-                                       "media-public"  => "{$directory}",
-                                       "media-temp"    => "{$directory}/temp",
-                                       "media-thumb"   => $thumbDir,
-                                       "media-deleted" => $deletedDir
+                                       "{$repoName}-public"  => "{$directory}",
+                                       "{$repoName}-temp"    => "{$directory}/temp",
+                                       "{$repoName}-thumb"   => $thumbDir,
+                                       "{$repoName}-deleted" => $deletedDir
                                ),
                                'fileMode'       => $fileMode,
                        ) );