Changeset 9741

Timestamp:

04/11/2015 11:07:06 AM (10 years ago)

Author:

djpaul

Message:

Core: move _bp_strip_spans_from_title() out of bp_modify_page_title().

The nested function was causing PHP Fatal Errors ("cannot redeclare") when WP's title functions were invoked more than once on the same screen.
This was introduced in r9732.

Fixes #6369

File:

• branches/2.2/src/bp-core/bp-core-filters.php (modified) (2 diffs)

branches/2.2/src/bp-core/bp-core-filters.php

@@ -541 +541 @@
     $displayed_user_name = bp_get_displayed_user_fullname();
 
-    /**
-     * Strip span tags out of title part strings.
-     *
-     * This is a temporary function for compatibility with WordPress versions
-     * less than 4.0, and should be removed at a later date.
-     *
-     * @param  string $title_part
-     * @return string
-     */
-    function _bp_strip_spans_from_title( $title_part = '' ) {
-        $title = $title_part;
-        $span = strpos( $title, '<span' );
-        if ( false !== $span ) {
-            $title = substr( $title, 0, $span - 1 );
-        }
-        return $title;
-    }
-
     // Displayed user
     if ( ! empty( $displayed_user_name ) && ! is_404() ) {
@@ -691 +673 @@
 add_filter( 'bp_modify_page_title', 'convert_chars'   );
 add_filter( 'bp_modify_page_title', 'esc_html'        );
+
+/**
+ * Strip span tags out of title part strings.
+ *
+ * This is a temporary function for compatibility with WordPress versions
+ * less than 4.0, and should be removed at a later date.
+ *
+ * @param  string $title_part
+ * @return string
+ */
+function _bp_strip_spans_from_title( $title_part = '' ) {
+    $title = $title_part;
+    $span = strpos( $title, '<span' );
+    if ( false !== $span ) {
+        $title = substr( $title, 0, $span - 1 );
+    }
+    return $title;
+}
 
 /**