From: dongsheng <dongsheng>
Date: Tue, 13 Jan 2009 05:04:15 +0000 (+0000)
Subject: "REPOSITORY/MDL-13766, provide accepted_types when sending request"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=46ee50dcc3f0f063bfba5aa2d584a70c2043ed94;p=moodle.git

"REPOSITORY/MDL-13766, provide accepted_types when sending request"
---

diff --git a/repository/javascript.php b/repository/javascript.php
index 80f1b2aff5..cf17858fbe 100644
--- a/repository/javascript.php
+++ b/repository/javascript.php
@@ -871,6 +871,7 @@ _client.login = function() {
     params['repo_id'] = _client.repositoryid;
     params['ctx_id'] = $context->id;
     params['sesskey']= '$sesskey';
+    params['accepted_types'] = _client.accepted_types;
     _client.loading('load');
     var trans = YAHOO.util.Connect.asyncRequest('POST',
             '$CFG->httpswwwroot/repository/ws.php?action=sign', _client.req_cb, _client.postdata(params));
diff --git a/repository/lib.php b/repository/lib.php
index 3a878b0e3f..26112e615a 100644
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1481,7 +1481,8 @@ abstract class repository {
                 $value->children = array_filter($value->children, array($this, 'filter'));
             }
         } else {
-            if ($accepted_types == '*' || in_array('*', $accepted_types)) {
+            if ($accepted_types == '*' or empty($accepted_types)
+                or (is_array($accepted_types) and in_array('*', $accepted_types))) {
                 $pass = true;
             } elseif (is_array($accepted_types)) {
                 foreach ($accepted_types as $type) {