From: dongsheng <dongsheng>
Date: Tue, 30 Jun 2009 02:12:16 +0000 (+0000)
Subject: "MDL-13766, update image path, see http://moodle.org/mod/forum/discuss.php?d=126887"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=390baf4664a8682a614a4b71df5a756ec8916c6e;p=moodle.git

"MDL-13766, update image path, see http://moodle.org/mod/forum/discuss.php?d=126887"
---

diff --git a/repository/alfresco/repository.class.php b/repository/alfresco/repository.class.php
index 6ec650f7fc..b75189c13b 100755
--- a/repository/alfresco/repository.class.php
+++ b/repository/alfresco/repository.class.php
@@ -99,8 +99,8 @@ class repository_alfresco extends repository {
     }
 
     public function get_listing($uuid = '', $path = '') {
-        global $CFG, $SESSION;
-
+        global $CFG, $SESSION, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $ret['dynload'] = true;
         $ret['list'] = array();
diff --git a/repository/boxnet/repository.class.php b/repository/boxnet/repository.class.php
index 537182419b..d43f57dd15 100755
--- a/repository/boxnet/repository.class.php
+++ b/repository/boxnet/repository.class.php
@@ -137,7 +137,8 @@ class repository_boxnet extends repository {
      * @return mixed
      */
     public function search($search_text) {
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $list = array();
         $ret  = array();
         $tree = $this->box->getAccountTree();
diff --git a/repository/draft/repository.class.php b/repository/draft/repository.class.php
index 42b469d184..614d2ebc23 100755
--- a/repository/draft/repository.class.php
+++ b/repository/draft/repository.class.php
@@ -32,7 +32,8 @@ class repository_draft extends repository {
      * @return mixed
      */
     public function get_listing($path = '', $page = '') {
-        global $CFG, $USER, $itemid;
+        global $CFG, $USER, $itemid, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $ret['dynload'] = true;
         $ret['nosearch'] = true;
diff --git a/repository/filepicker.php b/repository/filepicker.php
index e136c69489..d7841554cc 100755
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -22,6 +22,7 @@ require_once('lib.php');
 set_time_limit(0);
 
 require_login();
+$OUTPUT->initialise_deprecated_cfg_pixpath();
 
 $page        = optional_param('page', '',          PARAM_RAW);    // page
 $client_id   = optional_param('client_id', SITEID, PARAM_RAW);    // client ID
diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php
index abfa07a60c..73ae5e79a4 100644
--- a/repository/filesystem/repository.class.php
+++ b/repository/filesystem/repository.class.php
@@ -27,7 +27,8 @@ class repository_filesystem extends repository {
         }
     }
     public function get_listing($path = '', $page = '') {
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         $list = array();
         $list['list'] = array();
diff --git a/repository/lib.php b/repository/lib.php
index 473ae39fb7..d1a2823869 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -736,7 +736,8 @@ abstract class repository {
      * @return array information of file in file pool
      */
     public static function move_to_filepool($path, $name, $itemid, $filearea = 'user_draft') {
-        global $DB, $CFG, $USER;
+        global $DB, $CFG, $USER, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $context = get_context_instance(CONTEXT_USER, $USER->id);
         $now = time();
         $entry = new object();
@@ -895,7 +896,8 @@ abstract class repository {
      * todo: take $search into account, and respect a threshold for dynamic loading
      */
     public static function build_tree($fileinfo, $search, $dynamicmode, &$list) {
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         $filecount = 0;
         $children = $fileinfo->get_children();
diff --git a/repository/local/repository.class.php b/repository/local/repository.class.php
index 43aa600c7a..3eafcd7d8a 100755
--- a/repository/local/repository.class.php
+++ b/repository/local/repository.class.php
@@ -46,7 +46,8 @@ class repository_local extends repository {
      * @return mixed
      */
     public function get_listing($encodedpath = '', $page = '', $search = '') {
-        global $CFG, $USER;
+        global $CFG, $USER, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $ret['dynload'] = true;
         $ret['nosearch'] = true;
diff --git a/repository/mahara/repository.class.php b/repository/mahara/repository.class.php
index 77039784fc..ca82023c87 100644
--- a/repository/mahara/repository.class.php
+++ b/repository/mahara/repository.class.php
@@ -128,7 +128,8 @@ class repository_mahara extends repository {
      * @return <type>
      */
     public function get_listing($path = null, $page = 1, $search = '') {
-        global $CFG, $DB, $USER;
+        global $CFG, $DB, $USER, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
 
         ///check that Mahara has a good version
         ///We also check that the "get file list" method has been activated (if it is not
diff --git a/repository/s3/repository.class.php b/repository/s3/repository.class.php
index f0c9c761fd..4807a80caa 100644
--- a/repository/s3/repository.class.php
+++ b/repository/s3/repository.class.php
@@ -12,7 +12,8 @@ class repository_s3 extends repository {
         $this->s = new S3($this->access_key, $this->secret_key);
     }
     public function get_listing($path = '', $page = '') {
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $list = array();
         $list['list'] = array();
         // the management interface url
diff --git a/repository/url/repository.class.php b/repository/url/repository.class.php
index 77de3dc851..58f9183a95 100755
--- a/repository/url/repository.class.php
+++ b/repository/url/repository.class.php
@@ -79,8 +79,8 @@ EOD;
      * @return array
      */
     public function get_listing($path='', $page='') {
-        global $CFG;
-        set_time_limit(0);
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $ret = array();
         $curl = new curl;
         $msg = $curl->head($this->file_url);
@@ -109,7 +109,8 @@ EOD;
         return $ret;
     }
     public function analyse_page($baseurl, $content, &$list) {
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $pattern = '#src="?\'?([[:alnum:]:?=&@/._+-]+)"?\'?#i';
         $matches = null;
         preg_match_all($pattern, $content, $matches);
diff --git a/repository/webdav/repository.class.php b/repository/webdav/repository.class.php
index 7c39f58c25..638ac368fe 100644
--- a/repository/webdav/repository.class.php
+++ b/repository/webdav/repository.class.php
@@ -63,7 +63,8 @@ class repository_webdav extends repository {
         return false;
     }
     public function get_listing($path='', $page = '') {
-        global $CFG;
+        global $CFG, $OUTPUT;
+        $OUTPUT->initialise_deprecated_cfg_pixpath();
         $list = array();
         $ret  = array();
         $ret['dynload'] = true;