fix error where 4.6 change was not merged correctly to master.

[civicrm-core.git] / CRM / Core / Resources.php

diff --git a/CRM/Core/Resources.php b/CRM/Core/Resources.php
index 58bb8b46cb983fbe9ccf596714465f0fe489cc13..d12afab2d06dbc48d90a69ccd4b38fcc4a7bde40 100644 (file)
--- a/CRM/Core/Resources.php
+++ b/CRM/Core/Resources.php
@@ -525,7 +525,7 @@ class CRM_Core_Resources {
     $patterns = (array) $patterns;
     $files = array();
     foreach ($patterns as $pattern) {
-      if ($pattern{0} === '/') {
+      if (CRM_Utils_File::isAbsolute($pattern)) {
         // Absolute path.
         $files = array_merge($files, (array) glob($pattern, $flags));
       }
@@ -707,8 +707,8 @@ class CRM_Core_Resources {
       "packages/jquery/plugins/jquery.form$min.js",
       "packages/jquery/plugins/jquery.timeentry$min.js",
       "packages/jquery/plugins/jquery.blockUI$min.js",
-      "packages/jquery/plugins/DataTables/media/js/jquery.dataTables$min.js",
-      "packages/jquery/plugins/DataTables/media/css/jquery.dataTables$min.css",
+      "bower_components/datatables/media/js/jquery.dataTables$min.js",
+      "bower_components/datatables/media/css/jquery.dataTables$min.css",
       "bower_components/jquery-validation/dist/jquery.validate$min.js",
       "packages/jquery/plugins/jquery.ui.datepicker.validation.pack.js",
       "js/Common.js",