Changeset 11159 for sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/functions.php

Timestamp:

07/29/2021 07:02:19 PM (3 years ago)

Author:

ryelle

Message:

Pattern Directory: Sync with git WordPress/pattern-directory@83dd83bb283a1f3c47c54b2f07d726d917ca6bd2

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/functions.php (modified) (5 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-patterns/functions.php

@@ -16 +16 @@
 
 add_filter( 'archive_template', __NAMESPACE__ . '\use_index_php_as_template' );
-add_action( 'template_redirect', __NAMESPACE__ . '\rewrite_search_url' );
+add_action( 'template_redirect', __NAMESPACE__ . '\rewrite_urls' );
 
 /**
@@ -99 +99 @@
                     'site' => esc_url( home_url() ),
                     'login' => esc_url( wp_login_url() ),
+                    'register' => esc_url( wp_registration_url() ),
                 ) ) ),
             ),
@@ -178 +179 @@
     if ( $pagename ) {
         list( $_pagename ) = explode( '/', $pagename );
-        if ( in_array( $_pagename, array( 'my-patterns', 'my-favorites' ) ) ) {
+        if ( in_array( $_pagename, array( 'my-patterns', 'favorites' ) ) ) {
             // Need to get the page ID because this is set before `pre_get_posts` fires.
             $page = get_page_by_path( $_pagename );
@@ -206 +207 @@
 function add_rewrite() {
     add_rewrite_rule( '^my-patterns/[^/]+/?$', 'index.php?pagename=my-patterns', 'top' );
-    add_rewrite_rule( '^my-favorites/.+/?$', 'index.php?pagename=my-favorites', 'top' );
+    add_rewrite_rule( '^favorites/.+/?$', 'index.php?pagename=favorites', 'top' );
 }
 
@@ -256 +257 @@
 
 /**
- * Rewrites the search url from s={keyword} to /search/{keyword}.
+ * Set up redirects for the site.
  *
  * @return void
  */
-function rewrite_search_url() {
+function rewrite_urls() {
+    // Redirect searches to `/search/term`.
     if ( is_search() && ! empty( $_GET['s'] ) ) {
         wp_redirect( home_url( '/search/' ) . urlencode( trim( get_query_var( 's' ) ) ) . '/' );
+        exit();
+    }
+    // Redirect old slug `my-favorites` to `favorites`, see WordPress/pattern-directory#332.
+    $path = str_replace( 'patterns/', '', trim( $_SERVER['REQUEST_URI'], '/' ) );
+    if ( preg_match( '/^my-favorites(.*)/', $path, $matches ) ) {
+        wp_redirect( home_url( '/favorites/' . $matches[1] . '/' ) );
         exit();
     }