MDL-14865 Merged from 1.9 (Don't pass CFG to get_string)

diff --git a/mod/resource/type/file/resource.class.php b/mod/resource/type/file/resource.class.php
index fdfe53fd0cfa3e5f6746577b5f6516c7baac539a..47283a0d9cbbf42d2283709baa1e9b1687d4228b 100644 (file)
--- a/mod/resource/type/file/resource.class.php
+++ b/mod/resource/type/file/resource.class.php
@@ -24,6 +24,9 @@ class resource_file extends resource_base {
 
         $site = get_site();
 
+        $littlecfg = new object;       // to avoid some notices later
+        $littlecfg->wwwroot = $CFG->wwwroot;
+
 
         $this->parameters = array(
                 'label2'          => array('langstr' => "",
@@ -61,8 +64,8 @@ class resource_file extends resource_base {
                                            'value'   => current_language()),
                 'sitename'        => array('langstr' => get_string('fullsitename'),
                                            'value'   => format_string($site->fullname)),
-                'serverurl'       => array('langstr' => get_string('serverurl', 'resource', $CFG),
-                                           'value'   => $CFG->wwwroot),
+                'serverurl'       => array('langstr' => get_string('serverurl', 'resource', $littlecfg),
+                                           'value'   => $littlecfg->wwwroot),
                 'currenttime'     => array('langstr' => get_string('time'),
                                            'value'   => time()),
                 'encryptedcode'   => array('langstr' => get_string('encryptedcode'),