Changeset 1372

Timestamp:

03/04/2015 12:57:21 AM (11 years ago)

Author:

iandunn

Message:

WordCamp Post Types: Give preference to current page when deciding anchors.

This supports a new use case where the admin sets up a multiple pages that each contain [schedule], [speakers], and [sessions]. A camp might want to have page for each day that contained all of the information about what's going on that day, but not what's scheduled for other days.

In that situation, the anchor links in the schedule should point to the current page, rather than searching for the first page that contains the shortcodes.

File:

• sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php (modified) (3 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/plugins/wc-post-types/wc-post-types.php

@@ -734 +734 @@
      * Returns an anchor permalink for a Speaker or Session
      *
-     * If the speakers page is rendered with the [speakers] shortcode, it will
-     * contain IDs that can be used as anchors. This function will attempt to find
-     * a speakers page and link to the appropriate anchor.
-     *
-     * @param $post_id int The speaker/session's post ID.
+     * Any page with the [speakers | sessions] shortcode will contain IDs that can be used as anchors.
+     *
+     * If the current page contains the corresponding shortcode, we'll assume the user wants to link there.
+     * Otherwise, we'll attempt to find another page that contains the shortcode.
+     *
+     * @param $target_id int The speaker/session's post ID.
      *
      * @return string
      */
-    function get_wcpt_anchor_permalink( $post_id ) {
-        $post = get_post( $post_id );
-
-        if ( 'publish' != $post->post_status ) {
+    function get_wcpt_anchor_permalink( $target_id ) {
+        global $post;
+        $anchor_target = get_post( $target_id );
+
+        if ( 'publish' != $anchor_target->post_status ) {
             return '';
         }
 
-        switch( $post->post_type ) {
+        switch( $anchor_target->post_type ) {
             case 'wcb_speaker':
-                $permalink = $this->get_wcpt_permalink( 'speakers' );
-                $anchor_id = $post->post_name;
+                $permalink = has_shortcode( $post->post_content, 'speakers' ) ? get_permalink( $post->id ) : $this->get_wcpt_permalink( 'speakers' );
+                $anchor_id = $anchor_target->post_name;
                 break;
 
             case 'wcb_session':
-                $permalink = $this->get_wcpt_permalink( 'sessions' );
-                $anchor_id = $post->ID;
+                $permalink = has_shortcode( $post->post_content, 'sessions' ) ? get_permalink( $post->id ) : $this->get_wcpt_permalink( 'sessions' );
+                $anchor_id = $anchor_target->ID;
                 break;
 
@@ -772 +774 @@
             '%s#wcorg-%s-%s',
             $permalink,
-            str_replace( 'wcb_', '', $post->post_type ),
+            str_replace( 'wcb_', '', $anchor_target->post_type ),
             sanitize_html_class( $anchor_id )
         );
@@ -852 +854 @@
 
         if ( ! in_array( $attr['speaker_link'], array( 'anchor', 'wporg', 'permalink', 'none' ) ) )
-            $attr['speaker_link'] = 'anchor';
+            $attr['speaker_link'] = 'anchor';   // todo this is inconsistent with the values passed to shortcode_atts, and probably not needed if the default above is changed to 'anchor'
 
         $attr['orderby'] = ( in_array( $attr['orderby'], array( 'date', 'title', 'rand' ) ) ) ? $attr['orderby'] : 'date';