Changeset 1032701

Timestamp:

11/25/2014 08:56:59 PM (11 years ago)

Author:

tjsantilo

Message:

revert

Location:

because/trunk

Files:

• README.txt (modified) (1 diff)
• public/includes/class-sp_comments.php (modified) (1 diff)
• social-polling.php (modified) (1 diff)

because/trunk/README.txt

@@ -7 +7 @@
 Tested up to: 4.0
 <<<<<<< .mine
-Stable tag: 1.5.0
+Stable tag: 1.4.5
 =======
-Stable tag: 1.5.0
+Stable tag: 1.4.5
 >>>>>>> .r969865
 License: GPLv2 or later

because/trunk/public/includes/class-sp_comments.php

@@ -1567 +1567 @@
 function mytheme_comment($comment, $args, $depth) {
 
-    $GLOBALS['comment'] = $comment;
-
-    extract($args, EXTR_SKIP);
-
-
-
-    if ( 'div' == $args['style'] ) {
-
-        $tag = 'div';
-
-        $add_below = 'comment';
-
-    } else {
-
-        $tag = 'li ';
-
-        $add_below = 'div-comment';
+        $GLOBALS['comment'] = $comment;
+
+        extract($args, EXTR_SKIP);
+
+
+
+        if ( 'div' == $args['style'] ) {
+
+            $tag = 'div';
+
+            $add_below = 'comment';
+
+        } else {
+
+            $tag = 'li ';
+
+            $add_below = 'div-comment';
+
+        }
+
+?>
+
+<li <?php //echo $tag ?> <?php comment_class(empty( $args['has_children'] ) ? '' : 'parent') ?> id="comment-<?php comment_ID() ?>">
+
+    <?php if ( 'div' != $args['style'] ) : ?>
+
+        <div id="div-comment-<?php comment_ID() ?>" class="comment-body">
+
+        
+
+        
+
+         <div class="comment-meta commentmetadata">
+
+    <a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>">
+
+    <?php
+
+        /* translators: 1: date, 2: time */
+
+        printf( __('%1$s at %2$s'), get_comment_date(),  get_comment_time()) ?>
+
+    </a>
+
+    <?php edit_comment_link(__('(Edit)'),'  ','' );?>
+
+  </div><?php //.comment-meta.commentmetadata ?>
+
+        
+
+        
+
+    <?php endif; ?>
+
+    <div class="comment-author vcard">
+
+      <?php 
+
+      
+
+      if ($args['avatar_size'] != 0):
+
+          echo get_avatar( $comment, $args['avatar_size'] ); 
+
+      endif;
+
+      ?>
+
+    
+
+    
+
+    <?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()) ?> 
+
+      
+
+      
+
+   
+
+     
+
+      
+
+      <div style="clear:both"></div>
+
+    </div><?php //.comment-author vcard ?>
+
+    
+
+  <?php 
+
+    if($comment->comment_approved == '0') : ?>
+
+        <em class="comment-awaiting-moderation">
+
+            <?php _e('Your comment is awaiting moderation.') ?>
+
+        </em> 
+
+        <br />
+
+  <?php endif; ?>
+
+  
+
+ 
+
+  
+
+<?php   //Upvote DownVote Actions
+
+  
+
+  $comment_karma = $comment->comment_karma;
+
+  $comment_nonce = wp_create_nonce("upvote_downvote_flag_nonce");
+
+  $flag_nonce = wp_create_nonce("flag_nonce");
+
+  ob_start();?>
+
+    <style type="text/css">
+
+        .comment_vote_action{ display:block; overflow:hidden; margin-right:5px;}
+
+         .comment_karma_count{ float:none; margin-right:5px; vertical-align:middle;}
+
+    </style>
+
+    <div class="comment_controls">
+
+        
+
+<a data-nonce="<?php echo $comment_nonce; ?>" class="upvote comment_vote_action" href="javascript:void(0)" data_action="upvote" data-comment_id="<?php echo $comment->comment_ID;?>">
+<?php
+echo '<img src="' . plugins_url( '../../assets/upvote.png' , __FILE__ ) . '" class="votingbutton"> ';
+?>
+</a>
+             <div class="comment_karma_count"><?php echo $comment_karma; ?></div>
+<a data-nonce="<?php echo $comment_nonce; ?>" class="downvote comment_vote_action" href="javascript:void(0)" data_action="downvote"  data-comment_id="<?php echo $comment->comment_ID;?>">
+<?php
+echo '<img src="' . plugins_url( '../../assets/downvote.png' , __FILE__ ) . '" class="votingbutton"> ';
+?> 
+</a>
+ <?php /*?><a  data-nonce="<?php echo $comment_nonce; ?>" class="flag comment_vote_action" href="javascript:void(0)" data_action="flag"  data-comment_id="<?php echo $comment->comment_ID;?>"><strong>!</strong>Flag Comment</a><?php */?>
+
+        </div>
+
+<?php 
+
+      $upvote_downvote = ob_get_contents();
+
+      ob_end_clean();
+
+      echo $upvote_downvote
+
+   //End Upvote Down Vote Controls. ?> 
+
+  
+
+  
+
+  <?php comment_text() ?>
+
+  
+
+  
+
+  
+
+  <div class="reply">
+
+    <?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
+
+  </div>
+
+  <?php if ( 'div' != $args['style'] ) : ?>
+
+        </div>
+
+<?php endif; ?>
+
+<?php
+
+}//mytheme_comment
+
+
+
+
+
+
+
+//----------------------------
+
+//Comment_walker
+
+//----------------------------
+
+/** COMMENTS WALKER */
+
+class zipGun_walker_comment extends Walker_Comment {/**
+
+     * What the class handles.
+
+     *
+
+     * @see Walker::$tree_type
+
+     *
+
+     * @since 2.7.0
+
+     * @var string
+
+     */
+
+    var $tree_type = 'comment';
+
+
+
+    /**
+
+     * DB fields to use.
+
+     *
+
+     * @see Walker::$db_fields
+
+     *
+
+     * @since 2.7.0
+
+     * @var array
+
+     */
+
+    var $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
+
+
+
+    /**
+
+     * Start the list before the elements are added.
+
+     *
+
+     * @see Walker::start_lvl()
+
+     *
+
+     * @since 2.7.0
+
+     *
+
+     * @param string $output Passed by reference. Used to append additional content.
+
+     * @param int $depth Depth of comment.
+
+     * @param array $args Uses 'style' argument for type of HTML list.
+
+     */
+
+    function start_lvl( &$output, $depth = 0, $args = array() ) {
+
+        $GLOBALS['comment_depth'] = $depth + 1;
+
+
+
+        switch ( $args['style'] ) {
+
+            case 'div':
+
+                break;
+
+            case 'ol':
+
+                $output .= '<ol class="children">' . "\n";
+
+                break;
+
+            default:
+
+            case 'ul':
+
+                $output .= '<ul class="children">' . "\n";
+
+                break;
+
+        }
 
     }
 
+
+
+    /**
+
+     * End the list of items after the elements are added.
+
+     *
+
+     * @see Walker::end_lvl()
+
+     *
+
+     * @since 2.7.0
+
+     *
+
+     * @param string $output Passed by reference. Used to append additional content.
+
+     * @param int    $depth  Depth of comment.
+
+     * @param array  $args   Will only append content if style argument value is 'ol' or 'ul'.
+
+     */
+
+    function end_lvl( &$output, $depth = 0, $args = array() ) {
+
+        $GLOBALS['comment_depth'] = $depth + 1;
+
+
+
+        switch ( $args['style'] ) {
+
+            case 'div':
+
+                break;
+
+            case 'ol':
+
+                $output .= "</ol><!-- .children -->\n";
+
+                break;
+
+            default:
+
+            case 'ul':
+
+                $output .= "</ul><!-- .children -->\n";
+
+                break;
+
+        }
+
+    }
+
+
+
+    /**
+
+     * Traverse elements to create list from elements.
+
+     *
+
+     * This function is designed to enhance Walker::display_element() to
+
+     * display children of higher nesting levels than selected inline on
+
+     * the highest depth level displayed. This prevents them being orphaned
+
+     * at the end of the comment list.
+
+     *
+
+     * Example: max_depth = 2, with 5 levels of nested content.
+
+     * 1
+
+     *  1.1
+
+     *    1.1.1
+
+     *    1.1.1.1
+
+     *    1.1.1.1.1
+
+     *    1.1.2
+
+     *    1.1.2.1
+
+     * 2
+
+     *  2.2
+
+     *
+
+     * @see Walker::display_element()
+
+     *
+
+     * @since 2.7.0
+
+     *
+
+     * @param object $element           Data object.
+
+     * @param array  $children_elements List of elements to continue traversing.
+
+     * @param int    $max_depth         Max depth to traverse.
+
+     * @param int    $depth             Depth of current element.
+
+     * @param array  $args              An array of arguments. @see wp_list_comments()
+
+     * @param string $output            Passed by reference. Used to append additional content.
+
+     * @return null Null on failure with no changes to parameters.
+
+     */
+
+    function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
+
+
+
+        if ( !$element )
+
+            return;
+
+
+
+        $id_field = $this->db_fields['id'];
+
+        $id = $element->$id_field;
+
+
+
+        parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
+
+
+
+        // If we're at the max depth, and the current element still has children, loop over those and display them at this level
+
+        // This is to prevent them being orphaned to the end of the list.
+
+        if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
+
+            foreach ( $children_elements[ $id ] as $child )
+
+                $this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
+
+
+
+            unset( $children_elements[ $id ] );
+
+        }
+
+
+
+    }
+
+
+
+    /**
+
+     * Start the element output.
+
+     *
+
+     * @see Walker::start_el()
+
+     *
+
+     * @since 2.7.0
+
+     *
+
+     * @param string $output  Passed by reference. Used to append additional content.
+
+     * @param object $comment Comment data object.
+
+     * @param int    $depth   Depth of comment in reference to parents.
+
+     * @param array  $args    An array of arguments. @see wp_list_comments()
+
+     */
+
+    function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
+
+        $depth++;
+
+        $GLOBALS['comment_depth'] = $depth;
+
+        $GLOBALS['comment'] = $comment;
+
+
+
+        if ( !empty( $args['callback'] ) ) {
+
+            ob_start();
+
+            call_user_func( $args['callback'], $comment, $args, $depth );
+
+            $output .= ob_get_clean();
+
+            return;
+
+        }
+
+
+
+        if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
+
+            ob_start();
+
+            $this->ping( $comment, $depth, $args );
+
+            $output .= ob_get_clean();
+
+        } elseif ( 'html5' === $args['format'] ) {
+
+            ob_start();
+
+            $this->html5_comment( $comment, $depth, $args );
+
+            $output .= ob_get_clean();
+
+        } else {
+
+            ob_start();
+
+            $this->comment( $comment, $depth, $args );
+
+            $output .= ob_get_clean();
+
+        }
+
+    }
+
+
+
+    /**
+
+     * Ends the element output, if needed.
+
+     *
+
+     * @see Walker::end_el()
+
+     *
+
+     * @since 2.7.0
+
+     *
+
+     * @param string $output  Passed by reference. Used to append additional content.
+
+     * @param object $comment The comment object. Default current comment.
+
+     * @param int    $depth   Depth of comment.
+
+     * @param array  $args    An array of arguments. @see wp_list_comments()
+
+     */
+
+    function end_el( &$output, $comment, $depth = 0, $args = array() ) {
+
+        if ( !empty( $args['end-callback'] ) ) {
+
+            ob_start();
+
+            call_user_func( $args['end-callback'], $comment, $args, $depth );
+
+            $output .= ob_get_clean();
+
+            return;
+
+        }
+
+        if ( 'div' == $args['style'] )
+
+            $output .= "</div><!-- #comment-## -->\n";
+
+        else
+
+            $output .= "</li><!-- #comment-## -->\n";
+
+    }
+
+
+
+    /**
+
+     * Output a pingback comment.
+
+     *
+
+     * @access protected
+
+     * @since 3.6.0
+
+     *
+
+     * @param object $comment The comment object.
+
+     * @param int    $depth   Depth of comment.
+
+     * @param array  $args    An array of arguments. @see wp_list_comments()
+
+     */
+
+    protected function ping( $comment, $depth, $args ) {
+
+        $tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
+
 ?>
 
-<li <?php //echo $tag ?> <?php comment_class(empty( $args['has_children'] ) ? '' : 'parent') ?> id="comment-<?php comment_ID() ?>">
-
-    <?php if ( 'div' != $args['style'] ) : ?>
-
-        <div id="div-comment-<?php comment_ID() ?>" class="comment-body">
-
-        <div class="comment-author-container">
-
-            <div class="comment-author vcard">
-
-                <?php 
-                    if ($args['avatar_size'] != 0):
-
-                        echo get_avatar( $comment, $args['avatar_size'] ); 
-
-                    endif;
-
-                ?>
-                <?php printf(__('<cite class="fn">%s</cite> <span class="says">says:</span>'), get_comment_author_link()) ?> 
-                <span style="padding: 0 6px;">|</span>
-
-                <!-- <div style="clear:both"></div> -->
-
-                 <!-- <div class="comment-meta commentmetadata"> -->
-
-                    <a href="<?php echo htmlspecialchars( get_comment_link( $comment->comment_ID ) ) ?>">
-
-                    <?php
-
-                        /* translators: 1: date, 2: time */
-
-                        printf( __('%1$s at %2$s'), get_comment_date("n/d/Y"),  get_comment_time()) ?>
-
-                    </a>
-
-                    <?php edit_comment_link(__('(Edit)'),'  ','' );?>
-                <!-- </div><?php //.comment-meta.commentmetadata ?> -->
-            </div>
-
-            <div class="comment-collapse-button"><a href="#">-</a></div>
-
-
-            
-            <div style="clear:both"></div>
-        </div>
-    <?php endif; ?>
-
-            
-
-    
-
-  <?php 
-
-    if($comment->comment_approved == '0') : ?>
-
-        <em class="comment-awaiting-moderation">
-
-            <?php _e('Your comment is awaiting moderation.') ?>
-
-        </em> 
-
-        <br />
-
-  <?php endif; ?>
-
-  
-
- 
-
-  
-  <div class="comment-collapse">
-
-  <?php comment_text() ?>
-
-  
-
-  
-<?php   //Upvote DownVote Actions
-
-  
-
-  $comment_karma = $comment->comment_karma;
-
-  $comment_nonce = wp_create_nonce("upvote_downvote_flag_nonce");
-
-  $flag_nonce = wp_create_nonce("flag_nonce");
-
-  ob_start();?>
-
-
-    <div class="comment_controls">
-
-        
-
-            <a data-nonce="<?php echo $comment_nonce; ?>" class="upvote comment_vote_action" href="javascript:void(0)" data_action="upvote" data-comment_id="<?php echo $comment->comment_ID;?>">
+        <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
+
+            <div class="comment-body">
+
+                <?php _e( 'Pingback:' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
+
+            </div>
+
+<?php
+
+    }
+
+
+
+    /**
+
+     * Output a single comment.
+
+     *
+
+     * @access protected
+
+     * @since 3.6.0
+
+     *
+
+     * @param object $comment Comment to display.
+
+     * @param int    $depth   Depth of comment.
+
+     * @param array  $args    An array of arguments. @see wp_list_comments()
+
+     */
+
+    protected function comment( $comment, $depth, $args ) {
+
+        if ( 'div' == $args['style'] ) {
+
+            $tag = 'div';
+
+            $add_below = 'comment';
+
+        } else {
+
+            $tag = 'li';
+
+            $add_below = 'div-comment';
+
+        }
+
+        
+
+?>
+
+        < <?php echo $tag; ?> <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID(); ?>">
+
+        <?php if ( 'div' != $args['style'] ) : ?>
+
+        <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
+
+        <?php endif; ?>
+
+        <div class="comment-author vcard">
+
+            <?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
+
+            <?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
+
+        </div>
+
+        <?php if ( '0' == $comment->comment_approved ) : ?>
+
+        <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
+
+        <br />
+
+        <?php endif; ?>
+
+
+
+        <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
+
             <?php
-            echo '<img src="' . plugins_url( '../../assets/upvote.png' , __FILE__ ) . '" class="votingbutton"> ';
+
+                /* translators: 1: date, 2: time */
+
+                printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
+
             ?>
-            </a>
-                         <div class="comment_karma_count"><?php echo $comment_karma; ?></div>
-            <a data-nonce="<?php echo $comment_nonce; ?>" class="downvote comment_vote_action" href="javascript:void(0)" data_action="downvote"  data-comment_id="<?php echo $comment->comment_ID;?>">
-            <?php
-            echo '<img src="' . plugins_url( '../../assets/downvote.png' , __FILE__ ) . '" class="votingbutton"> ';
-            ?> 
-            </a>
-             
-
-    </div>
-
-<?php 
-
-      $upvote_downvote = ob_get_contents();
-
-      ob_end_clean();
-
-     
-
-   //End Upvote Down Vote Controls. ?> 
-
-  
-
-  
-
-  <div class="reply-vote-share-container">
-
-    <?php  echo $upvote_downvote; ?>
-
-    <span class="comment-pipe">|</span>
-      
-
-        <?php comment_reply_link(array_merge( $args, array('add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth']))) ?>
-
-     
-      <!-- <span class="comment-pipe">|</span>
-      <a href="#">Share</a>
-      <div class="comment-social-share">aaa</div> -->
-
-  </div>
-
-  </div>
-  
-
-
-  <?php if ( 'div' != $args['style'] ) : ?>
 
         </div>
 
-<?php endif; ?>
+
+
+        <?php comment_text( get_comment_id(), array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+
+
+
+        <div class="reply">
+
+            <?php comment_reply_link( array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+
+        </div>
+
+        <?php if ( 'div' != $args['style'] ) : ?>
+
+        </div>
+
+        <?php endif; ?>
 
 <?php
 
-}//mytheme_comment
-
-
-
-
-
-
+    }
+
+
+
+    /**
+
+     * Output a comment in the HTML5 format.
+
+     *
+
+     * @access protected
+
+     * @since 3.6.0
+
+     *
+
+     * @param object $comment Comment to display.
+
+     * @param int    $depth   Depth of comment.
+
+     * @param array  $args    An array of arguments. @see wp_list_comments()
+
+     */
+
+    protected function html5_comment( $comment, $depth, $args ) {
+
+        $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
+
+?>
+
+        <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
+
+            <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
+
+                <footer class="comment-meta">
+
+                    <div class="comment-author vcard">
+
+                        <?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
+
+                        <?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link() ) ); ?>
+
+                    </div><!-- .comment-author -->
+
+
+
+                    <div class="comment-metadata">
+
+                        <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
+
+                            <time datetime="<?php comment_time( 'c' ); ?>">
+
+                                <?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
+
+                            </time>
+
+                        </a>
+
+                        <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
+
+                    </div><!-- .comment-metadata -->
+
+
+
+                    <?php if ( '0' == $comment->comment_approved ) : ?>
+
+                    <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
+
+                    <?php endif; ?>
+
+                </footer><!-- .comment-meta -->
+
+
+
+                <div class="comment-content">
+
+                    <?php comment_text(); ?>
+
+                </div><!-- .comment-content -->
+
+
+
+                <div class="reply">
+
+                    <?php comment_reply_link( array_merge( $args, array( 'add_below' => 'div-comment', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
+
+                </div><!-- .reply -->
+
+            </article><!-- .comment-body -->
+
+<?php
+
+    }
+
+}
 
 //----------------------------
 
-//Comment_walker
+//END Comment_walker
 
 //----------------------------
-
-/** COMMENTS WALKER */
-
-class zipGun_walker_comment extends Walker_Comment {/**
-
-     * What the class handles.
-
-     *
-
-     * @see Walker::$tree_type
-
-     *
-
-     * @since 2.7.0
-
-     * @var string
-
-     */
-
-    var $tree_type = 'comment';
-
-
-
-    /**
-
-     * DB fields to use.
-
-     *
-
-     * @see Walker::$db_fields
-
-     *
-
-     * @since 2.7.0
-
-     * @var array
-
-     */
-
-    var $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID');
-
-
-
-    /**
-
-     * Start the list before the elements are added.
-
-     *
-
-     * @see Walker::start_lvl()
-
-     *
-
-     * @since 2.7.0
-
-     *
-
-     * @param string $output Passed by reference. Used to append additional content.
-
-     * @param int $depth Depth of comment.
-
-     * @param array $args Uses 'style' argument for type of HTML list.
-
-     */
-
-    function start_lvl( &$output, $depth = 0, $args = array() ) {
-
-        $GLOBALS['comment_depth'] = $depth + 1;
-
-
-
-        switch ( $args['style'] ) {
-
-            case 'div':
-
-                break;
-
-            case 'ol':
-
-                $output .= '<ol class="children">' . "\n";
-
-                break;
-
-            default:
-
-            case 'ul':
-
-                $output .= '<ul class="children">' . "\n";
-
-                break;
-
-        }
-
-    }
-
-
-
-    /**
-
-     * End the list of items after the elements are added.
-
-     *
-
-     * @see Walker::end_lvl()
-
-     *
-
-     * @since 2.7.0
-
-     *
-
-     * @param string $output Passed by reference. Used to append additional content.
-
-     * @param int    $depth  Depth of comment.
-
-     * @param array  $args   Will only append content if style argument value is 'ol' or 'ul'.
-
-     */
-
-    function end_lvl( &$output, $depth = 0, $args = array() ) {
-
-        $GLOBALS['comment_depth'] = $depth + 1;
-
-
-
-        switch ( $args['style'] ) {
-
-            case 'div':
-
-                break;
-
-            case 'ol':
-
-                $output .= "</ol><!-- .children -->\n";
-
-                break;
-
-            default:
-
-            case 'ul':
-
-                $output .= "</ul><!-- .children -->\n";
-
-                break;
-
-        }
-
-    }
-
-
-
-    /**
-
-     * Traverse elements to create list from elements.
-
-     *
-
-     * This function is designed to enhance Walker::display_element() to
-
-     * display children of higher nesting levels than selected inline on
-
-     * the highest depth level displayed. This prevents them being orphaned
-
-     * at the end of the comment list.
-
-     *
-
-     * Example: max_depth = 2, with 5 levels of nested content.
-
-     * 1
-
-     *  1.1
-
-     *    1.1.1
-
-     *    1.1.1.1
-
-     *    1.1.1.1.1
-
-     *    1.1.2
-
-     *    1.1.2.1
-
-     * 2
-
-     *  2.2
-
-     *
-
-     * @see Walker::display_element()
-
-     *
-
-     * @since 2.7.0
-
-     *
-
-     * @param object $element           Data object.
-
-     * @param array  $children_elements List of elements to continue traversing.
-
-     * @param int    $max_depth         Max depth to traverse.
-
-     * @param int    $depth             Depth of current element.
-
-     * @param array  $args              An array of arguments. @see wp_list_comments()
-
-     * @param string $output            Passed by reference. Used to append additional content.
-
-     * @return null Null on failure with no changes to parameters.
-
-     */
-
-    function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) {
-
-
-
-        if ( !$element )
-
-            return;
-
-
-
-        $id_field = $this->db_fields['id'];
-
-        $id = $element->$id_field;
-
-
-
-        parent::display_element( $element, $children_elements, $max_depth, $depth, $args, $output );
-
-
-
-        // If we're at the max depth, and the current element still has children, loop over those and display them at this level
-
-        // This is to prevent them being orphaned to the end of the list.
-
-        if ( $max_depth <= $depth + 1 && isset( $children_elements[$id]) ) {
-
-            foreach ( $children_elements[ $id ] as $child )
-
-                $this->display_element( $child, $children_elements, $max_depth, $depth, $args, $output );
-
-
-
-            unset( $children_elements[ $id ] );
-
-        }
-
-
-
-    }
-
-
-
-    /**
-
-     * Start the element output.
-
-     *
-
-     * @see Walker::start_el()
-
-     *
-
-     * @since 2.7.0
-
-     *
-
-     * @param string $output  Passed by reference. Used to append additional content.
-
-     * @param object $comment Comment data object.
-
-     * @param int    $depth   Depth of comment in reference to parents.
-
-     * @param array  $args    An array of arguments. @see wp_list_comments()
-
-     */
-
-    function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) {
-
-        $depth++;
-
-        $GLOBALS['comment_depth'] = $depth;
-
-        $GLOBALS['comment'] = $comment;
-
-
-
-        if ( !empty( $args['callback'] ) ) {
-
-            ob_start();
-
-            call_user_func( $args['callback'], $comment, $args, $depth );
-
-            $output .= ob_get_clean();
-
-            return;
-
-        }
-
-
-
-        if ( ( 'pingback' == $comment->comment_type || 'trackback' == $comment->comment_type ) && $args['short_ping'] ) {
-
-            ob_start();
-
-            $this->ping( $comment, $depth, $args );
-
-            $output .= ob_get_clean();
-
-        } elseif ( 'html5' === $args['format'] ) {
-
-            ob_start();
-
-            $this->html5_comment( $comment, $depth, $args );
-
-            $output .= ob_get_clean();
-
-        } else {
-
-            ob_start();
-
-            $this->comment( $comment, $depth, $args );
-
-            $output .= ob_get_clean();
-
-        }
-
-    }
-
-
-
-    /**
-
-     * Ends the element output, if needed.
-
-     *
-
-     * @see Walker::end_el()
-
-     *
-
-     * @since 2.7.0
-
-     *
-
-     * @param string $output  Passed by reference. Used to append additional content.
-
-     * @param object $comment The comment object. Default current comment.
-
-     * @param int    $depth   Depth of comment.
-
-     * @param array  $args    An array of arguments. @see wp_list_comments()
-
-     */
-
-    function end_el( &$output, $comment, $depth = 0, $args = array() ) {
-
-        if ( !empty( $args['end-callback'] ) ) {
-
-            ob_start();
-
-            call_user_func( $args['end-callback'], $comment, $args, $depth );
-
-            $output .= ob_get_clean();
-
-            return;
-
-        }
-
-        if ( 'div' == $args['style'] )
-
-            $output .= "</div><!-- #comment-## -->\n";
-
-        else
-
-            $output .= "</li><!-- #comment-## -->\n";
-
-    }
-
-
-
-    /**
-
-     * Output a pingback comment.
-
-     *
-
-     * @access protected
-
-     * @since 3.6.0
-
-     *
-
-     * @param object $comment The comment object.
-
-     * @param int    $depth   Depth of comment.
-
-     * @param array  $args    An array of arguments. @see wp_list_comments()
-
-     */
-
-    protected function ping( $comment, $depth, $args ) {
-
-        $tag = ( 'div' == $args['style'] ) ? 'div' : 'li';
-
-?>
-
-        <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class(); ?>>
-
-            <div class="comment-body">
-
-                <?php _e( 'Pingback:' ); ?> <?php comment_author_link(); ?> <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
-
-            </div>
-
-<?php
-
-    }
-
-
-
-    /**
-
-     * Output a single comment.
-
-     *
-
-     * @access protected
-
-     * @since 3.6.0
-
-     *
-
-     * @param object $comment Comment to display.
-
-     * @param int    $depth   Depth of comment.
-
-     * @param array  $args    An array of arguments. @see wp_list_comments()
-
-     */
-
-    protected function comment( $comment, $depth, $args ) {
-
-        if ( 'div' == $args['style'] ) {
-
-            $tag = 'div';
-
-            $add_below = 'comment';
-
-        } else {
-
-            $tag = 'li';
-
-            $add_below = 'div-comment';
-
-        }
-
-        
-
-?>
-
-        < <?php echo $tag; ?> <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?> id="comment-<?php comment_ID(); ?>">
-
-        <?php if ( 'div' != $args['style'] ) : ?>
-
-        <div id="div-comment-<?php comment_ID(); ?>" class="comment-body">
-
-        <?php endif; ?>
-
-        <div class="comment-author vcard">
-
-            <?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-
-            <?php printf( __( '<cite class="fn">%s</cite> <span class="says">says:</span>' ), get_comment_author_link() ); ?>
-
-        </div>
-
-        <?php if ( '0' == $comment->comment_approved ) : ?>
-
-        <em class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ) ?></em>
-
-        <br />
-
-        <?php endif; ?>
-
-
-
-        <div class="comment-meta commentmetadata"><a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
-
-            <?php
-
-                /* translators: 1: date, 2: time */
-
-                printf( __( '%1$s at %2$s' ), get_comment_date(),  get_comment_time() ); ?></a><?php edit_comment_link( __( '(Edit)' ), '&nbsp;&nbsp;', '' );
-
-            ?>
-
-        </div>
-
-
-
-        <?php comment_text( get_comment_id(), array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-
-
-
-        <div class="reply">
-
-            <?php comment_reply_link( array_merge( $args, array( 'add_below' => $add_below, 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-
-        </div>
-
-        <?php if ( 'div' != $args['style'] ) : ?>
-
-        </div>
-
-        <?php endif; ?>
-
-<?php
-
-    }
-
-
-
-    /**
-
-     * Output a comment in the HTML5 format.
-
-     *
-
-     * @access protected
-
-     * @since 3.6.0
-
-     *
-
-     * @param object $comment Comment to display.
-
-     * @param int    $depth   Depth of comment.
-
-     * @param array  $args    An array of arguments. @see wp_list_comments()
-
-     */
-
-    protected function html5_comment( $comment, $depth, $args ) {
-
-        $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';
-
-?>
-
-        <<?php echo $tag; ?> id="comment-<?php comment_ID(); ?>" <?php comment_class( empty( $args['has_children'] ) ? '' : 'parent' ); ?>>
-
-            <article id="div-comment-<?php comment_ID(); ?>" class="comment-body">
-
-                <footer class="comment-meta">
-
-                    <div class="comment-author vcard">
-
-                        <?php if ( 0 != $args['avatar_size'] ) echo get_avatar( $comment, $args['avatar_size'] ); ?>
-
-                        <?php printf( __( '%s <span class="says">says:</span>' ), sprintf( '<b class="fn">%s</b>', get_comment_author_link() ) ); ?>
-
-                    </div><!-- .comment-author -->
-
-
-
-                    <div class="comment-metadata">
-
-                        <a href="<?php echo esc_url( get_comment_link( $comment->comment_ID ) ); ?>">
-
-                            <time datetime="<?php comment_time( 'c' ); ?>">
-
-                                <?php printf( _x( '%1$s at %2$s', '1: date, 2: time' ), get_comment_date(), get_comment_time() ); ?>
-
-                            </time>
-
-                        </a>
-
-                        <?php edit_comment_link( __( 'Edit' ), '<span class="edit-link">', '</span>' ); ?>
-
-                    </div><!-- .comment-metadata -->
-
-
-
-                    <?php if ( '0' == $comment->comment_approved ) : ?>
-
-                    <p class="comment-awaiting-moderation"><?php _e( 'Your comment is awaiting moderation.' ); ?></p>
-
-                    <?php endif; ?>
-
-                </footer><!-- .comment-meta -->
-
-
-
-                <div class="comment-content">
-
-                    <?php comment_text(); ?>
-
-                </div><!-- .comment-content -->
-
-
-
-                <div class="reply">
-
-                    <?php comment_reply_link( array_merge( $args, array( 'add_below' => 'div-comment', 'depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ); ?>
-
-                </div><!-- .reply -->
-
-            </article><!-- .comment-body -->
-
-<?php
-
-    }
-
-}
-
-//----------------------------
-
-//END Comment_walker
-
-//----------------------------

because/trunk/social-polling.php

@@ -34 +34 @@
 
 <<<<<<< .mine
- * Version:           1.5.0
+ * Version:           1.4.5
 =======
- * Version:           1.5.0
+ * Version:           1.4.5
 >>>>>>> .r969865