"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 6ec650f7fc6ea35860910c61ec907507e15520ef..b75189c13bfbde829b860e4415521baf55c8002f 100755 (executable)
--- 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 537182419b5f4e367aaf9393c137d34b1e443b7f..d43f57dd153a9089abed91b8e66e8dbbf42b8729 100755 (executable)
--- 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 42b469d184e0933e470ed2592b2fb7b93dd2fd22..614d2ebc23e20c6b3e6359a1e4a85502c876f321 100755 (executable)
--- 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 e136c694894f8b55406d84a3d281db40680b5efb..d7841554ccf347a4fcafab27d85cf3ea28899b8b 100755 (executable)
--- 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 abfa07a60cd996132d9c6819efd3c93e00ed4772..73ae5e79a49a324d6fd850e8b74cf4cb41e435ff 100644 (file)
--- 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 473ae39fb74b4bc1083e336abfaa07089aaadf05..d1a2823869961365556684f1e188a63c8ce97c88 100644 (file)
--- 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 43aa600c7af0a225c09e00a555fcb943dfeadc61..3eafcd7d8a64bb15033d1eac20eeedaa4346c986 100755 (executable)
--- 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 77039784fcf8c8ddf7670ff1d108eea9e835d052..ca82023c87bc3723dd394ac316fa0f1e12299f27 100644 (file)
--- 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 f0c9c761fd24a786f5ab1e3f14a6bfac86fbcee4..4807a80caa0cda033c5bccaecc3c5d42664916c5 100644 (file)
--- 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 77de3dc851149888a0343ed96210f005946369fb..58f9183a9517f67a0b96bba5174af1b83a085a42 100755 (executable)
--- 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 7c39f58c25871919835f58713148ac30ecddf834..638ac368fe6c279c4a47652afbf8abf5c1ff5b2c 100644 (file)
--- 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;