Changeset 5134 for trunk/includes/common/template.php

Timestamp:

10/21/2013 08:30:12 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Use rewrite ID helper functions instead of hardcoded strings.

File:

• trunk/includes/common/template.php (modified) (6 diffs)

trunk/includes/common/template.php

@@ -807 +807 @@
 
     // Check query name
-    if ( empty( $retval ) && bbp_is_query_name( 'bbp_search' ) )
+    if ( empty( $retval ) && bbp_is_query_name( bbp_get_search_rewrite_id() ) )
         $retval = true;
 
@@ -845 +845 @@
 
     // Check $_REQUEST
-    if ( empty( $retval ) && !empty( $_REQUEST[bbp_get_search_rewrite_id()] ) )
+    if ( empty( $retval ) && !empty( $_REQUEST[ bbp_get_search_rewrite_id() ] ) )
         $retval = true;
 
@@ -1889 +1889 @@
      * Get the view id
      *
-     * If a view id is supplied, that is used. Otherwise the 'bbp_view'
-     * query var is checked for.
+     * Use view id if supplied, otherwise bbp_get_view_rewrite_id() query var.
      *
      * @since bbPress (r2789)
@@ -1896 +1895 @@
      * @param string $view Optional. View id.
      * @uses sanitize_title() To sanitize the view id
-     * @uses get_query_var() To get the view id from query var 'bbp_view'
+     * @uses get_query_var() To get the view id query variable
+     * @uses bbp_get_view_rewrite_id() To get the view rewrite ID
      * @return bool|string ID on success, false on failure
      */
@@ -1902 +1902 @@
         $bbp = bbpress();
 
-        $view = !empty( $view ) ? sanitize_title( $view ) : get_query_var( 'bbp_view' );
+        $view = !empty( $view ) ? sanitize_title( $view ) : get_query_var( bbp_get_view_rewrite_id() );
 
         if ( array_key_exists( $view, $bbp->views ) )
@@ -1982 +1982 @@
         // Unpretty permalinks
         } else {
-            $url = add_query_arg( array( 'bbp_view' => $view ), home_url( '/' ) );
+            $url = add_query_arg( array( bbp_get_view_rewrite_id() => $view ), home_url( '/' ) );
         }