Changeset 5186 for trunk/includes/core/template-functions.php

Timestamp:

11/25/2013 02:55:13 AM (12 years ago)

Author:

johnjamesjacoby

Message:

Check the $located variable to avoid trying to enqueue a style or script that was not found.

File:

• trunk/includes/core/template-functions.php (modified) (4 diffs)

trunk/includes/core/template-functions.php

@@ -130 +130 @@
 function bbp_enqueue_style( $handle = '', $file = '', $dependencies = array(), $version = false, $media = 'all' ) {
 
+    // No file found yet
+    $located = false;
+
     // Trim off any slashes from the template name
     $file = ltrim( $file, '/' );
@@ -153 +156 @@
     }
 
-    // Make path to file relative to site URL
-    $located = trailingslashit( site_url() ) . str_replace( ABSPATH, '', $located );
-
-    // Enqueue the style
-    wp_enqueue_style( $handle, $located, $dependencies, $version, $media );
+    // Enqueue if located
+    if ( !empty( $located ) ) {
+
+        // Make path to file relative to site URL
+        $located = trailingslashit( site_url() ) . str_replace( ABSPATH, '', $located );
+
+        // Enqueue the style
+        wp_enqueue_style( $handle, $located, $dependencies, $version, $media );
+    }
 
     return $located;
@@ -182 +189 @@
 function bbp_enqueue_script( $handle = '', $file = '', $dependencies = array(), $version = false, $in_footer = 'all' ) {
 
+    // No file found yet
+    $located = false;
+
     // Trim off any slashes from the template name
     $file = ltrim( $file, '/' );
@@ -205 +215 @@
     }
 
-    // Make path to file relative to site URL
-    $located = trailingslashit( site_url() ) . str_replace( ABSPATH, '', $located );
-
-    // Enqueue the style
-    wp_enqueue_script( $handle, $located, $dependencies, $version, $in_footer );
+    // Enqueue if located
+    if ( !empty( $located ) ) {
+
+        // Make path to file relative to site URL
+        $located = trailingslashit( site_url() ) . str_replace( ABSPATH, '', $located );
+
+        // Enqueue the style
+        wp_enqueue_script( $handle, $located, $dependencies, $version, $in_footer );
+    }
 
     return $located;