From: Petr Skoda <skodak@moodle.org>
Date: Fri, 25 Dec 2009 10:40:30 +0000 (+0000)
Subject: MDL-21139 search for YUI3 images before YUI2
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=3fb70edba3d56fc16836855eae4acd6f6b2b2b80;p=moodle.git

MDL-21139 search for YUI3 images before YUI2
---

diff --git a/lib/outputlib.php b/lib/outputlib.php
index 7b056cec7d..18fd4a4b4e 100644
--- a/lib/outputlib.php
+++ b/lib/outputlib.php
@@ -892,6 +892,10 @@ class theme_config {
                     return $imagefile;
                 }
             }
+            if ($imagefile = $this->image_exists("$CFG->libdir/yui/$CFG->yui3version/assets/skins/sam/$image")) {
+                // YUI3 takes precedence
+                return $imagefile;
+            }
             if ($imagefile = $this->image_exists("$CFG->libdir/yui/$CFG->yui2version/assets/skins/sam/$image")) {
                 return $imagefile;
             }