From: Petr Skoda <skodak@moodle.org>
Date: Tue, 29 Dec 2009 12:38:50 +0000 (+0000)
Subject: MDL-21193 improved error messages in combo loader
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=a4738eb361dd45b6ca20e0518d9380f1236c5164;p=moodle.git

MDL-21193 improved error messages in combo loader
---

diff --git a/theme/yui_combo.php b/theme/yui_combo.php
index 7c2e78af61..b7899d8a13 100644
--- a/theme/yui_combo.php
+++ b/theme/yui_combo.php
@@ -54,15 +54,18 @@ foreach ($parts as $part) {
     $part = min_clean_param($part, 'SAFEPATH');
     $bits = explode('/', $part);
     if (count($bits) < 2) {
-        combo_not_found();
+        $content .= "\n// Wrong combo resource $part!\n";
+        continue;
     }
     $version = $bits[0];
     if ($version != $CFG->yui3version and $version != $CFG->yui2version) {
-        combo_not_found();
+        $content .= "\n// Wrong combo version $part!\n";
+        continue;
     }
     $contentfile = "$CFG->libdir/yui/$part";
     if (!file_exists($contentfile) or !is_file($contentfile)) {
-        combo_not_found();
+        $content .= "\n// Combo resource $part not found!\n";
+        continue;
     }
     $filecontent = file_get_contents($contentfile);