Merge remote-tracking branch 'upstream/4.3' into 4.3-master-2013-08-21-20-13-45

CRM/Event/Badge.php

@@ -100,23 +100,19 @@ class CRM_Event_Badge {
       $img = get_class($this) . "." . $this->imgExtension;
     }
 
-    $config = CRM_Core_Config::singleton();
-    $imgFile = $config->customTemplateDir . "/$path/$eventID/$img";
-    if (file_exists($imgFile)) {
-      return $imgFile;
-    }
-    $imgFile = $config->customTemplateDir . "/$path/$img";
-    if (file_exists($imgFile)) {
-      return $imgFile;
-    }
-
-    $imgFile = "$civicrm_root/templates/$path/$eventID/$img";
-    if (file_exists($imgFile)) {
-      return $imgFile;
-    }
-    $imgFile = "$civicrm_root/templates/$path/$img";
-    if (!file_exists($imgFile) && !$this->debug) {
-      return FALSE;
+    // CRM-13235 - leverage the Smarty path to get all templates directories
+    $template = CRM_Core_Smarty::singleton();
+    if (isset($template->template_dir) && $template->template_dir) {
+      $dirs = is_array( $template->template_dir ) ? $template->template_dir : array($template->template_dir);
+      foreach ($dirs as $dir) {
+        foreach (array( "$dir/$path/$eventID/$img", "$dir/$path/$img") as $imgFile) {
+          if (file_exists($imgFile)) {
+            return $imgFile;
+          }
+        }
+      }
+    } else {
+      $imgFile = 'No template directories defined anywhere??';
     }
 
     // not sure it exists, but at least will display a meaniful fatal error in debug mode