Changeset 1774316

Timestamp:

11/23/2017 07:57:15 PM (8 years ago)

Author:

dunar21

Message:

All categories were displaying when only one was expected.

Location:

wp-moo-tree/trunk

Files:

• README.txt (modified) (2 diffs)
• tree-shortcode.php (modified) (5 diffs)
• wp-moo-tree.php (modified) (1 diff)

wp-moo-tree/trunk/README.txt

@@ -7 +7 @@
 Tags: genealogy, file tree, family tree, tree, hierarchy, hierarchy tree, files, family, families, folders, folder list, file list, list, family list, 
 Requires at least: 3.0.1
-Tested up to: 3.4
-Stable tag: 1.0.5
+Tested up to: 4.9
+Stable tag: 1.1.0
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -69 +69 @@
 
 == Changelog ==
+= 1.1.0 =
+* Bug fix; Multiple categories were displayed when only one expected.
 = 1.0.5 =
 * minor bug fix; when creating new category, fields would not save, had to be edited after creation.

wp-moo-tree/trunk/tree-shortcode.php

@@ -92 +92 @@
                         'title_li'     => '',
                         'echo'         => 0,
+                        //'child_of'       => $taxonomy_term->term_id,
                         'sort_column'  => 'post_date',
                         'post_type'    => 'mootree',
                         'post_status'  => 'publish',
                         'walker'       => $mootree_walker,
+                        'link_before'  => $taxonomy_term->term_id,
                         'link_after'    => 'mootree'
                         );
@@ -102 +104 @@
                     $piecesof .= '</ul>';
                     $piecesof .= '<div style="clear:both;padding-top:20px"></div>';
-                    return $piecesof;
+                    return $piecesof . "<br/><br/><br/><pre>" . $thelist . "</pre>";
 }//funct
 
@@ -141 +143 @@
         
         if($link_after == 'mootree'){
-        
+                $termID = (int)$link_before;
+                $term_list = wp_get_post_terms($page->ID, 'tree-categories', array("fields" => "ids"));
                 if(has_post_thumbnail($page->ID)) {
                     $printlink = wp_get_attachment_url( get_post_thumbnail_id($page->ID) );
@@ -175 +178 @@
                 if ($thdescript && $thdescript != ""){$commentatts .= 'description: ' . $thdescript . ';';}
                 
-                $output .= $indent . '<li class="' . $page->post_name . '" ><a href="' . $printlink . '" name="' . $page->post_name . '" title="" ><!-- ' . $commentatts . ' -->' . apply_filters( 'the_title', $page->post_title, $page->ID ) . '</a>';
+                if(in_array($termID, $term_list)){
+                    $output .= $indent . '<li class="' . $page->post_name . '" ><a href="' . $printlink . '" name="' . $page->post_name . '" title="" ><!-- ' . $commentatts . ' -->' . apply_filters( 'the_title', $page->post_title, $page->ID ) . '</a>';
+                }
                     
                                     
@@ -195 +200 @@
     }
     
+    function end_el(&$output, $page, $depth = 0, $args = array()){
+        $partOfCateg = false;
+        if($link_after == 'mootree'){
+            $termID = (int)$link_before;
+            $term_list = wp_get_post_terms($page->ID, 'tree-categories', array("fields" => "ids"));
+            if(in_array($termID, $term_list)){
+                if(isset( $args['item_spacing']) && 'preserve' === $args['item_spacing']){
+                    $t = "\t";
+                    $n = "\n";
+                }else{
+                    $t = '';
+                    $n = '';
+                }
+                $output .= "</li>{$n}";
+            }
+        }else{      
+            if(isset( $args['item_spacing']) && 'preserve' === $args['item_spacing']){
+                $t = "\t";
+                $n = "\n";
+            }else{
+                $t = '';
+                $n = '';
+            }
+            $output .= "</li>{$n}";
+        }
+    }
+    
 }
 ?>

wp-moo-tree/trunk/wp-moo-tree.php

@@ -4 +4 @@
  *Plugin URI: http://aryanduntley.com/wordpressplugins/mootree
  *Description: Generates file, geneology, etc., trees via custom post types.
- *Version: 1.0.5
+ *Version: 1.1.0
  *Author: Aryan Duntley
  *Author URI: http://aryanduntley.com/