Changeset 3215060

Timestamp:

12/31/2024 12:38:59 AM (15 months ago)

Author:

mtekk

Message:

pre-7.4.0 commit

Location:

breadcrumb-navxt/trunk

Files:

• breadcrumb-navxt.php (modified) (3 diffs)
• class.bcn_admin.php (modified) (3 diffs)
• class.bcn_breadcrumb.php (modified) (1 diff)
• class.bcn_breadcrumb_trail.php (modified) (8 diffs)
• class.bcn_network_admin.php (modified) (1 diff)
• class.bcn_widget.php (modified) (1 diff)

breadcrumb-navxt/trunk/breadcrumb-navxt.php

@@ -4 +4 @@
 Plugin URI: http://mtekk.us/code/breadcrumb-navxt/
 Description: Adds a breadcrumb navigation showing the visitor&#39;s path to their current location. For details on how to use this plugin visit <a href="http://mtekk.us/code/breadcrumb-navxt/">Breadcrumb NavXT</a>. 
-Version: 7.3.1
+Version: 7.4.0
 Author: John Havlik
 Author URI: http://mtekk.us/
@@ -64 +64 @@
 class breadcrumb_navxt
 {
-    const version = '7.3.1';
+    const version = '7.4.0';
     protected $name = 'Breadcrumb NavXT';
     protected $identifier = 'breadcrumb-navxt';
@@ -726 +726 @@
 }
 //Have to bootstrap our startup so that other plugins can replace the bcn_breadcrumb_trail object if they need to
-add_action('plugins_loaded', 'bcn_init', 15);
+add_action('init', 'bcn_init', 5);
 function bcn_init()
 {

breadcrumb-navxt/trunk/class.bcn_admin.php

@@ -45 +45 @@
 class bcn_admin extends adminKit
 {
-    const version = '7.3.1';
+    const version = '7.4.0';
     protected $full_name = 'Breadcrumb NavXT Settings';
     protected $short_name = 'Breadcrumb NavXT';
@@ -575 +575 @@
                         </th>
                         <td>
-                            <?php wp_dropdown_pages(
-                                    array('name' => $this->unique_prefix . '_options[apost_' . $post_type->name . '_root]',
+                            <?php wp_dropdown_pages( apply_filters(
+                                    'bcn_admin_post_root_args',
+                                        array('name' => $this->unique_prefix . '_options[apost_' . $post_type->name . '_root]',
                                             'id' => $optid,
                                             'echo' => 1,
@@ -582 +583 @@
                                             'option_none_value' => '0',
                                             'selected' => $this->settings['apost_' . $post_type->name . '_root']->get_value(),
-                                            'class' => $overriden_style['apost_' . $post_type->name . '_root']));
+                                            'class' => $overriden_style['apost_' . $post_type->name . '_root']),
+                                    $post_type->name
+                                    ));
                             if(isset($overriden['apost_' . $post_type->name . '_root']) && $overriden['apost_' . $post_type->name . '_root'] !== '')
                             {

breadcrumb-navxt/trunk/class.bcn_breadcrumb.php

@@ -22 +22 @@
 {
     //Our member variables
-    const version = '7.3.1';
+    const version = '7.4.0';
     //The main text that will be shown
     protected $title;

breadcrumb-navxt/trunk/class.bcn_breadcrumb_trail.php

@@ -22 +22 @@
 {
     //Our member variables
-    const version = '7.3.1';
+    const version = '7.4.0';
     //An array of breadcrumbs
     public $breadcrumbs = array();
@@ -326 +326 @@
      * @param int $parent (optional) The id of the parent of the current post, used if hiearchal posts will be the "taxonomy" for the current post
      */
+    //TODO/FIXME Move to passing in WP_POST instead of id, type and parent
     protected function post_hierarchy($id, $type, $parent = null)
     {
@@ -393 +394 @@
         {
             $parent = get_post($id);
+            if(!($parent instanceof WP_Post))
+            {
+                return;
+            }
         }
         //Finish off with trying to find the type archive
@@ -1006 +1011 @@
      * Breadcrumb Trail Filling Function
      * 
-     * @param bool $force Whether or not to force the fill function to run in the loop.
+     * @param bool $use_loop_post Whether or not to generate for the post within the loop or the page containing the loop (usually an archive of some sort)
      * 
      * This functions fills the breadcrumb trail.
      */
-    public function fill($force = false)
+    public function fill($use_loop_post = false)
     {
         global $wpdb, $wp_query, $wp, $wp_taxonomies;
@@ -1047 +1052 @@
         }
         //For the front page, as it may also validate as a page, do it first
-        if(is_front_page() && !$force)
+        if(is_front_page() && (!$use_loop_post || !in_the_loop()))
         {
             //Must have two seperate branches so that we don't evaluate it as a page
@@ -1056 +1061 @@
         }
         //For posts
-        else if(is_singular() || ($force && in_the_loop()))
+        else if(is_singular() || ($use_loop_post && in_the_loop()))
         {
             //Could use the $post global, but we can't really trust it
@@ -1062 +1067 @@
             $this->do_post($type, false, (get_query_var('page') > 1));
             //If this is an attachment then we need to change the queried object to the parent post
-            if(is_attachment())
-            {
-                $type = get_post($type->post_parent); //TODO check for WP_Error?
+            if(is_attachment() && $type instanceof WP_Post)
+            {
+                $type = get_post($type->post_parent);
             }
             if($type instanceof WP_Post)
@@ -1155 +1160 @@
         }
         //We always do the home link last, unless on the frontpage
-        if(!is_front_page())
+        if(!is_front_page() || ($use_loop_post && in_the_loop()))
         {
             $this->do_home(true, false, false);

breadcrumb-navxt/trunk/class.bcn_network_admin.php

@@ -30 +30 @@
 class bcn_network_admin extends bcn_admin
 {
-    const version = '7.3.1';
+    const version = '7.4.0';
     protected $full_name = 'Breadcrumb NavXT Network Settings';
     protected $access_level = 'manage_network_options';

breadcrumb-navxt/trunk/class.bcn_widget.php

@@ -20 +20 @@
 class bcn_widget extends WP_Widget
 {
-    const version = '7.3.1';
+    const version = '7.4.0';
     protected $allowed_html = array();
     protected $defaults = array('title' => '', 'pretext' => '', 'type' => 'microdata', 'linked' => true, 'reverse' => false, 'front' => false, 'force' => false);