Skip to content
Browse files

Merge branch 'w36_MDL-35168_m23_yuipath' of git://github.com/skodak/m…

…oodle into MOODLE_23_STABLE
  • Loading branch information...
2 parents e815aa8 + 58520c0 commit a31d7a0ed3066dd52e9aa59d4669a8712f30b407 @stronk7 stronk7 committed Sep 3, 2012
Showing with 2 additions and 1 deletion.
  1. +2 −1 theme/yui_combo.php
View
3 theme/yui_combo.php
@@ -109,7 +109,8 @@
$contentfile = "$CFG->libdir/yui/$part";
}
if (!file_exists($contentfile) or !is_file($contentfile)) {
- $content .= "\n// Combo resource $part ($contentfile) not found!\n";
+ $location = '$CFG->dirroot'.preg_replace('/^'.preg_quote($CFG->dirroot, '/').'/', '', $contentfile);
+ $content .= "\n// Combo resource $part ($location) not found!\n";
continue;
}
$filecontent = file_get_contents($contentfile);

0 comments on commit a31d7a0

Please sign in to comment.
Something went wrong with that request. Please try again.