filemanager MDL-16597 fix YUI repository requires and remove style='display:none...

diff --git a/lib/form/filemanager.php b/lib/form/filemanager.php
index 1d2198962b34d6c6e8d91e4bcc5c9a1c7ccef024..ff0e56e45c8ddc487d4878b4d4e47226d75ff263 100644 (file)
--- a/lib/form/filemanager.php
+++ b/lib/form/filemanager.php
@@ -173,7 +173,7 @@ class MoodleQuickForm_filemanager extends HTML_QuickForm_element {
         $str .= $repojs;
         $str .= <<<EOD
 <input value="$draftitemid" name="{$this->_attributes['name']}" type="hidden" />
-<a href="###" id="btnadd-{$client_id}" style="display:none" class="btnaddfile" onclick="return callpicker('$id', '$client_id', '$draftitemid')">$straddfile</a>
+<a href="###" id="btnadd-{$client_id}" class="btnaddfile" onclick="return callpicker('$id', '$client_id', '$draftitemid')">$straddfile</a>
 EOD;
         $PAGE->requires->yui_lib('dom');
         $PAGE->requires->js_function_call('YAHOO.util.Dom.setStyle', Array("btnadd-{$client_id}", 'display', 'inline'));

diff --git a/repository/lib.php b/repository/lib.php
index e37aee0e9baca3ae0f58cc7beca6fb3d891fb888..d5554923d151565ecab45d171debc6dc7af6f344 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -604,7 +604,7 @@ abstract class repository {
             $params[] = $type;
         }
         $sql .= ' order by r.sortorder, i.name';
-
+       
         if (!$repos = $DB->get_records_sql($sql, $params)) {
             $repos = array();
         }
@@ -1388,7 +1388,7 @@ abstract class repository {
             $ret[$entry->name] = $entry->value;
         }
         if (!empty($config)) {
-            return $ret[$config];
+                return $ret[$config];
         } else {
             return $ret;
         }
@@ -1721,19 +1721,19 @@ function repository_setup_default_plugins() {
 function repository_head_setup() {
     global $PAGE;
 
-    $PAGE->requires->yui_lib('yahoo');
-    $PAGE->requires->yui_lib('dom');
-    $PAGE->requires->yui_lib('element');
-    $PAGE->requires->yui_lib('event');
-    $PAGE->requires->yui_lib('json');
-    $PAGE->requires->yui_lib('treeview');
-    $PAGE->requires->yui_lib('dragdrop');
-    $PAGE->requires->yui_lib('container');
-    $PAGE->requires->yui_lib('resize');
-    $PAGE->requires->yui_lib('layout');
-    $PAGE->requires->yui_lib('connection');
-    $PAGE->requires->yui_lib('button');
-    $PAGE->requires->yui_lib('selector');
+    $PAGE->requires->yui_lib('yahoo')->in_head();
+    $PAGE->requires->yui_lib('dom')->in_head();
+    $PAGE->requires->yui_lib('element')->in_head();
+    $PAGE->requires->yui_lib('event')->in_head();
+    $PAGE->requires->yui_lib('json')->in_head();
+    $PAGE->requires->yui_lib('treeview')->in_head();
+    $PAGE->requires->yui_lib('dragdrop')->in_head();
+    $PAGE->requires->yui_lib('container')->in_head();
+    $PAGE->requires->yui_lib('resize')->in_head();
+    $PAGE->requires->yui_lib('layout')->in_head();
+    $PAGE->requires->yui_lib('connection')->in_head();
+    $PAGE->requires->yui_lib('button')->in_head();
+    $PAGE->requires->yui_lib('selector')->in_head();
 
     //TODO: remove the ->in_head() once we refactor the inline script tags in repo code
     $PAGE->requires->js('repository/repository.src.js')->in_head();