Ticket #25388: 25388-walker_comment.2.diff
File 25388-walker_comment.2.diff, 5.3 KB (added by , 11 years ago) |
---|
-
src/wp-includes/comment-template.php
1473 1473 */ 1474 1474 class Walker_Comment extends Walker { 1475 1475 /** 1476 * What the class handles. 1477 * 1476 1478 * @see Walker::$tree_type 1479 * 1477 1480 * @since 2.7.0 1478 1481 * @var string 1479 1482 */ 1480 1483 var $tree_type = 'comment'; 1481 1484 1482 1485 /** 1486 * DB fields to use. 1487 * 1483 1488 * @see Walker::$db_fields 1489 * 1484 1490 * @since 2.7.0 1485 1491 * @var array 1486 1492 */ 1487 1493 var $db_fields = array ('parent' => 'comment_parent', 'id' => 'comment_ID'); 1488 1494 1489 1495 /** 1496 * Start the list before the elements are added. 1497 * 1490 1498 * @see Walker::start_lvl() 1499 * 1491 1500 * @since 2.7.0 1492 1501 * 1493 1502 * @param string $output Passed by reference. Used to append additional content. … … 1511 1520 } 1512 1521 1513 1522 /** 1523 * End the list of items after the elements are added. 1524 * 1514 1525 * @see Walker::end_lvl() 1526 * 1515 1527 * @since 2.7.0 1516 1528 * 1517 1529 * @param string $output Passed by reference. Used to append additional content. 1518 * @param int $depthDepth of comment.1519 * @param array $argsWill only append content if style argument value is 'ol' or 'ul'.1530 * @param int $depth Depth of comment. 1531 * @param array $args Will only append content if style argument value is 'ol' or 'ul'. 1520 1532 */ 1521 1533 function end_lvl( &$output, $depth = 0, $args = array() ) { 1522 1534 $GLOBALS['comment_depth'] = $depth + 1; … … 1535 1547 } 1536 1548 1537 1549 /** 1550 * Traverse elements to create list from elements. 1551 * 1538 1552 * This function is designed to enhance Walker::display_element() to 1539 1553 * display children of higher nesting levels than selected inline on 1540 1554 * the highest depth level displayed. This prevents them being orphaned … … 1551 1565 * 2 1552 1566 * 2.2 1553 1567 * 1568 * @see Walker::display_element() 1569 * 1570 * @since 2.7.0 1571 * 1572 * @param object $element Data object. 1573 * @param array $children_elements List of elements to continue traversing. 1574 * @param int $max_depth Max depth to traverse. 1575 * @param int $depth Depth of current element. 1576 * @param array $args An array of arguments. @see wp_list_comments() 1577 * @param string $output Passed by reference. Used to append additional content. 1578 * @return null Null on failure with no changes to parameters. 1554 1579 */ 1555 1580 function display_element( $element, &$children_elements, $max_depth, $depth, $args, &$output ) { 1556 1581 … … 1574 1599 } 1575 1600 1576 1601 /** 1602 * Start the element output. 1603 * 1577 1604 * @see Walker::start_el() 1605 * 1578 1606 * @since 2.7.0 1579 1607 * 1580 * @param string $output Passed by reference. Used to append additional content.1608 * @param string $output Passed by reference. Used to append additional content. 1581 1609 * @param object $comment Comment data object. 1582 * @param int $depthDepth of comment in reference to parents.1583 * @param array $args1610 * @param int $depth Depth of comment in reference to parents. 1611 * @param array $args An array of arguments. @see wp_list_comments() 1584 1612 */ 1585 1613 function start_el( &$output, $comment, $depth = 0, $args = array(), $id = 0 ) { 1586 1614 $depth++; … … 1602 1630 } 1603 1631 1604 1632 /** 1633 * Ends the element output, if needed. 1634 * 1605 1635 * @see Walker::end_el() 1636 * 1606 1637 * @since 2.7.0 1607 1638 * 1608 * @param string $output Passed by reference. Used to append additional content.1609 * @param object $comment 1610 * @param int $depthDepth of comment.1611 * @param array $args1639 * @param string $output Passed by reference. Used to append additional content. 1640 * @param object $comment The comment object. Default current comment. 1641 * @param int $depth Depth of comment. 1642 * @param array $args An array of arguments. @see wp_list_comments() 1612 1643 */ 1613 1644 function end_el( &$output, $comment, $depth = 0, $args = array() ) { 1614 1645 if ( !empty( $args['end-callback'] ) ) { … … 1622 1653 } 1623 1654 1624 1655 /** 1625 * @since 3.6 1656 * Output a pingback comment. 1657 * 1626 1658 * @access protected 1659 * @since 3.6.0 1627 1660 * 1628 * @param object $comment 1629 * @param int $depthDepth of comment.1630 * @param array $args1661 * @param object $comment The comment object. 1662 * @param int $depth Depth of comment. 1663 * @param array $args An array of arguments. @see wp_list_comments() 1631 1664 */ 1632 1665 protected function ping( $comment, $depth, $args ) { 1633 1666 $tag = ( 'div' == $args['style'] ) ? 'div' : 'li'; … … 1640 1673 } 1641 1674 1642 1675 /** 1643 * @since 3.6 1676 * Output a single comment. 1677 * 1644 1678 * @access protected 1679 * @since 3.6.0 1645 1680 * 1646 1681 * @param object $comment Comment to display. 1647 * @param int $depthDepth of comment.1648 * @param array $args Optional args.1682 * @param int $depth Depth of comment. 1683 * @param array $args An array of arguments. @see wp_list_comments() 1649 1684 */ 1650 1685 protected function comment( $comment, $depth, $args ) { 1651 1686 if ( 'div' == $args['style'] ) { … … 1688 1723 } 1689 1724 1690 1725 /** 1691 * @since 3.6 1726 * Output a comment in the HTML5 format. 1727 * 1692 1728 * @access protected 1729 * @since 3.6.0 1693 1730 * 1694 1731 * @param object $comment Comment to display. 1695 * @param int $depthDepth of comment.1696 * @param array $args Optional args.1732 * @param int $depth Depth of comment. 1733 * @param array $args An array of arguments. @see wp_list_comments() 1697 1734 */ 1698 1735 protected function html5_comment( $comment, $depth, $args ) { 1699 1736 $tag = ( 'div' === $args['style'] ) ? 'div' : 'li';