Replace usage of deprecated getRootUrl() method
[lhc/web/wiklou.git] / includes / filerepo / FileRepo.php
index 1195d5f..faed953 100644 (file)
@@ -1717,7 +1717,6 @@ class FileRepo {
         */
        protected function assertWritableRepo() {}
 
-
        /**
         * Return information about the repository.
         *
@@ -1725,12 +1724,24 @@ class FileRepo {
         * @since 1.22
         */
        public function getInfo() {
-               return array(
+               $ret = array(
                        'name' => $this->getName(),
                        'displayname' => $this->getDisplayName(),
-                       'rootUrl' => $this->getRootUrl(),
+                       'rootUrl' => $this->getZoneUrl( 'public' ),
                        'local' => $this->isLocal(),
                );
+
+               $optionalSettings = array(
+                       'url', 'thumbUrl', 'initialCapital', 'descBaseUrl', 'scriptDirUrl', 'articleUrl',
+                       'fetchDescription', 'descriptionCacheExpiry', 'scriptExtension'
+               );
+               foreach ( $optionalSettings as $k ) {
+                       if ( isset( $this->$k ) ) {
+                               $ret[$k] = $this->$k;
+                       }
+               }
+
+               return $ret;
        }
 }