MDL-21139 search for YUI3 images before YUI2

diff --git a/lib/outputlib.php b/lib/outputlib.php
index 7b056cec7d9fc080ae37c1637ae6b8aa043bb036..18fd4a4b4e77cd9376aa1c3b914ff25e34bbeb39 100644 (file)
--- 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;
             }