Changeset 6967

Timestamp:

11/19/2019 05:47:56 PM (5 years ago)

Author:

johnjamesjacoby

Message:

Slugs: add support for configuring the "Edit" slug.

This commit adds supporting functions and UI for allowing the edit slug to be modified. This omission was originally intentional, as the rewrite rules and pretty permalink support were not fully implemented. Now that they are in 2.6, there is no reason not to allow this slug to be modified.

Related changes include swapping out the new slug setting for the rewrite ID in a few places, and removing a single hardcoded reference to 'edit' that was also overlooked.

Props espellcaste for noticing. Fixes #3285. For 2.7, trunk.

Location:

trunk/src

Files:

• bbpress.php (modified) (1 diff)
• includes/admin/settings.php (modified) (4 diffs)
• includes/core/options.php (modified) (1 diff)
• includes/extend/buddypress/groups.php (modified) (2 diffs)
• includes/replies/template.php (modified) (1 diff)
• includes/topics/template.php (modified) (2 diffs)
• includes/users/template.php (modified) (1 diff)

trunk/src/bbpress.php

@@ -890 +890 @@
         // Tertiary Slugs
         $feed_slug          = 'feed';
-        $edit_slug          = 'edit';
+        $edit_slug          = bbp_get_edit_slug();
         $paged_slug         = bbp_get_paged_slug();
         $user_favs_slug     = bbp_get_user_favorites_slug();

trunk/src/includes/admin/settings.php

@@ -385 +385 @@
                 'sanitize_callback' => 'bbp_sanitize_slug',
                 'args'              => array( 'label_for'=>'_bbp_reply_slug' )
+            ),
+
+            // Edit slug setting
+            '_bbp_edit_slug' => array(
+                'title'             => esc_html__( 'Edit', 'bbpress' ),
+                'callback'          => 'bbp_admin_setting_callback_edit_slug',
+                'sanitize_callback' => 'bbp_sanitize_slug',
+                'args'              => array( 'label_for'=>'_bbp_edit_slug' )
             ),
 
@@ -1277 +1285 @@
 ?>
 
-    <p><?php printf( esc_html__( 'Custom slugs for single forums, topics, replies, tags, views, and search.', 'bbpress' ), get_admin_url( null, 'options-permalink.php' ) ); ?></p>
+    <p><?php printf( esc_html__( 'Custom slugs for single forums, topics, replies, tags, views, edit, and search.', 'bbpress' ), get_admin_url( null, 'options-permalink.php' ) ); ?></p>
 
 <?php
@@ -1371 +1379 @@
     // Slug Check
     bbp_form_slug_conflict_check( '_bbp_search_slug', 'search' );
+}
+
+/**
+ * Edit slug setting field
+ *
+ * @since 2.6.2 bbPress (r6965)
+ */
+function bbp_admin_setting_callback_edit_slug() {
+?>
+
+    <input name="_bbp_edit_slug" id="_bbp_edit_slug" type="text" class="regular-text code" value="<?php bbp_form_option( '_bbp_edit_slug', 'edit', true ); ?>"<?php bbp_maybe_admin_setting_disabled( '_bbp_edit_slug' ); ?> />
+
+<?php
+    // Slug Check
+    bbp_form_slug_conflict_check( '_bbp_edit_slug', 'edit' );
 }
 
@@ -2025 +2048 @@
             '_bbp_reply_slug'         => array( 'name' => esc_html__( 'Reply slug',  'bbpress' ), 'default' => 'reply',  'context' => 'bbPress' ),
 
+            // Edit slug
+            '_bbp_edit_slug'          => array( 'name' => esc_html__( 'Edit slug',   'bbpress' ), 'default' => 'edit',   'context' => 'bbPress' ),
+
             // User profile slug
             '_bbp_user_slug'          => array( 'name' => esc_html__( 'User base',   'bbpress' ), 'default' => 'users',  'context' => 'bbPress' ),

trunk/src/includes/core/options.php

@@ -974 +974 @@
 }
 
+/**
+ * Return the edit slug
+ *
+ * @since 2.6.2 bbPress (r6965)
+ *
+ * @param string $default Optional. Default value 'edit'
+ * @return string
+ */
+function bbp_get_edit_slug( $default = 'edit' ) {
+
+    // Filter & return
+    return apply_filters( 'bbp_get_edit_slug', get_option( '_bbp_edit_slug', $default ) );
+}
+
 /** Legacy ********************************************************************/
 

trunk/src/includes/extend/buddypress/groups.php

@@ -930 +930 @@
 
                     // Topic edit
-                    if ( bp_action_variable( $offset + 2 ) === bbp_get_edit_rewrite_id() ) :
+                    if ( bp_action_variable( $offset + 2 ) === bbp_get_edit_slug() ) :
 
                         // Unset the super sticky link on edit topic template
@@ -1003 +1003 @@
                     }
 
-                    if ( bp_action_variable( $offset + 2 ) === bbp_get_edit_rewrite_id() ) :
+                    if ( bp_action_variable( $offset + 2 ) === bbp_get_edit_slug() ) :
 
                         // Get the main query object

trunk/src/includes/replies/template.php

@@ -1906 +1906 @@
         // https://bbpress.trac.wordpress.org/ticket/3054
         if ( false === strpos( $reply_link, '?' ) ) {
-            $url = trailingslashit( $reply_link ) . bbp_get_edit_rewrite_id();
+            $url = trailingslashit( $reply_link ) . bbp_get_edit_slug();
             $url = user_trailingslashit( $url );
 

trunk/src/includes/topics/template.php

@@ -2461 +2461 @@
         // https://bbpress.trac.wordpress.org/ticket/3054
         if ( false === strpos( $topic_link, '?' ) ) {
-            $url = trailingslashit( $topic_link ) . bbp_get_edit_rewrite_id();
+            $url = trailingslashit( $topic_link ) . bbp_get_edit_slug();
             $url = user_trailingslashit( $url );
 
@@ -3584 +3584 @@
             // Pretty or ugly URL
             $retval = bbp_use_pretty_urls()
-                ? user_trailingslashit( trailingslashit( bbp_get_topic_tag_link() ) . bbp_get_edit_rewrite_id() )
+                ? user_trailingslashit( trailingslashit( bbp_get_topic_tag_link() ) . bbp_get_edit_slug() )
                 : add_query_arg( array( bbp_get_edit_rewrite_id() => '1' ), bbp_get_topic_tag_link() );
 

trunk/src/includes/users/template.php

@@ -636 +636 @@
         // Pretty permalinks
         if ( bbp_use_pretty_urls() ) {
-            $url = trailingslashit( $profile_url ) . 'edit';
+            $url = trailingslashit( $profile_url ) . bbp_get_edit_slug();
             $url = user_trailingslashit( $url );