Changeset 7348 for trunk/src/includes/core/theme-compat.php

Timestamp:

08/01/2025 04:12:03 PM (8 months ago)

Author:

johnjamesjacoby

Message:

Core - Canonical: Convert bbp_redirect_canonical() into a sub-action.

This change abstracts the existing internal canonical redirect logic into new dedicated functions so that they can be individually improved or customized in the future.

Pagination and Editing theme-side require intercepting and preventing the core redirection when requesting certain URLs, and there are likely to be new conditions in the future.

In trunk, for 2.7.

Fixes #3648.

File:

• trunk/src/includes/core/theme-compat.php (modified) (1 diff)

trunk/src/includes/core/theme-compat.php

@@ -851 +851 @@
 }
 
-/** Helpers *******************************************************************/
-
-/**
- * Remove the canonical redirect to allow pretty pagination
- *
- * @since 2.0.0 bbPress (r2628)
- *
- * @param string $redirect_url Redirect url
- *
- * @return bool|string False if it's a topic/forum and their first page,
- *                      otherwise the redirect url
- */
-function bbp_redirect_canonical( $redirect_url ) {
-
-    // Canonical is for the beautiful
-    if ( bbp_use_pretty_urls() ) {
-
-        // If viewing beyond page 1 of several
-        if ( 1 < bbp_get_paged() ) {
-
-            // Only on single topics...
-            if ( bbp_is_single_topic() ) {
-                $redirect_url = false;
-
-            // ...and single forums...
-            } elseif ( bbp_is_single_forum() ) {
-                $redirect_url = false;
-
-            // ...and single replies...
-            } elseif ( bbp_is_single_reply() ) {
-                $redirect_url = false;
-
-            // ...and any single anything else...
-            //
-            // @todo - Find a more accurate way to disable paged canonicals for
-            //          paged shortcode usage within other posts.
-            } elseif ( is_page() || is_singular() ) {
-                $redirect_url = false;
-            }
-
-        // If editing a topic
-        } elseif ( bbp_is_topic_edit() ) {
-            $redirect_url = false;
-
-        // If editing a reply
-        } elseif ( bbp_is_reply_edit() ) {
-            $redirect_url = false;
+/** Redirection ***************************************************************/
+
+/**
+ * Prevent canonical redirection when editing forums, topics, topic-tags,
+ * replies, and users.
+ *
+ * @since 2.7.0 bbPress (r7345)
+ *
+ * @param string $redirect_url The redirect URL.
+ *
+ * @return string Empty string if cancelling redirection.
+ */
+function bbp_do_not_redirect_edits( $redirect_url = '' ) {
+
+    // Default return value
+    $retval = $redirect_url;
+
+    // Pretty URLs only
+    if ( ! bbp_use_pretty_urls() ) {
+        return $retval;
+    }
+
+    // If editing a forum, topic, topic-tag, reply, or user
+    if ( bbp_is_edit() ) {
+        $retval = '';
+    }
+
+    // Return
+    return $retval;
+}
+
+/**
+ * Prevent canonical redirection to allow pretty pagination of forums & topics.
+ *
+ * @since 2.7.0 bbPress (r7345)
+ *
+ * @param string $redirect_url The redirect URL.
+ *
+ * @return string Empty string if cancelling redirection.
+ */
+function bbp_do_not_redirect_paginations( $redirect_url = '' ) {
+
+    // Default return value
+    $retval = $redirect_url;
+
+    // Pretty URLs only
+    if ( ! bbp_use_pretty_urls() ) {
+        return $retval;
+    }
+
+    // If viewing beyond page 1 of several
+    if ( 1 < bbp_get_paged() ) {
+
+        // Only on single topics...
+        if ( bbp_is_single_topic() ) {
+            $retval = '';
+
+        // ...and single forums...
+        } elseif ( bbp_is_single_forum() ) {
+            $retval = '';
+
+        // ...and single replies...
+        } elseif ( bbp_is_single_reply() ) {
+            $retval = '';
+
+        // ...and any single anything else...
+        //
+        // @todo - Find a more accurate way to disable paged canonicals for
+        //          paged shortcode usage within other posts.
+        } elseif ( is_page() || is_singular() ) {
+            $retval = '';
         }
     }
 
-    return $redirect_url;
+    // Return
+    return $retval;
 }