| Index: trunk/extensions/CategoryTree/CategoryTreeFunctions.php |
| — | — | @@ -593,9 +593,9 @@ |
| 594 | 594 | $attr = array( 'class' => 'CategoryTreeBullet' ); |
| 595 | 595 | |
| 596 | 596 | # Get counts, with conversion to integer so === works |
| 597 | | - # Note: $pageCount is the total number of cat members, |
| | 597 | + # Note: $allCount is the total number of cat members, |
| 598 | 598 | # not the count of how many members are normal pages. |
| 599 | | - $pageCount = $cat ? intval( $cat->getPageCount() ) : 0; |
| | 599 | + $allCount = $cat ? intval( $cat->getPageCount() ) : 0; |
| 600 | 600 | $subcatCount = $cat ? intval( $cat->getSubcatCount() ) : 0; |
| 601 | 601 | $fileCount = $cat ? intval( $cat->getFileCount() ) : 0; |
| 602 | 602 | |
| — | — | @@ -605,9 +605,9 @@ |
| 606 | 606 | if ( $mode == CT_MODE_CATEGORIES ) { |
| 607 | 607 | $count = $subcatCount; |
| 608 | 608 | } elseif ( $mode == CT_MODE_PAGES ) { |
| 609 | | - $count = $pageCount - $fileCount; |
| | 609 | + $count = $allCount - $fileCount; |
| 610 | 610 | } else { |
| 611 | | - $count = $pageCount; |
| | 611 | + $count = $allCount; |
| 612 | 612 | } |
| 613 | 613 | } |
| 614 | 614 | if ( $count === 0 ) { |
| — | — | @@ -650,11 +650,11 @@ |
| 651 | 651 | $s .= Xml::openElement( 'a', array( 'class' => $labelClass, 'href' => $wikiLink ) ) . $label . Xml::closeElement( 'a' ); |
| 652 | 652 | |
| 653 | 653 | if ( $count !== false && $this->getOption( 'showcount' ) ) { |
| 654 | | - $pages = $pageCount - $subcatCount - $fileCount; |
| | 654 | + $pages = $allCount - $subcatCount - $fileCount; |
| 655 | 655 | |
| 656 | 656 | global $wgContLang, $wgLang; |
| 657 | 657 | $attr = array( |
| 658 | | - 'title' => wfMsgExt( 'categorytree-member-counts', 'parsemag', $subcatCount, $pages , $fileCount, $pageCount, $count ), |
| | 658 | + 'title' => wfMsgExt( 'categorytree-member-counts', 'parsemag', $subcatCount, $pages , $fileCount, $allCount, $count ), |
| 659 | 659 | 'dir' => $wgLang->getDir() # numbers and commas get messed up in a mixed dir env |
| 660 | 660 | ); |
| 661 | 661 | |
| — | — | @@ -665,7 +665,7 @@ |
| 666 | 666 | if ( $subcatCount ) { |
| 667 | 667 | $memberNums[] = wfMessage( 'categorytree-num-categories', $wgLang->formatNum( $subcatCount ) )->text(); |
| 668 | 668 | } |
| 669 | | - if ( $pageCount ) { |
| | 669 | + if ( $pages ) { |
| 670 | 670 | $memberNums[] = wfMessage( 'categorytree-num-pages', $wgLang->formatNum( $pages ) )->text(); |
| 671 | 671 | } |
| 672 | 672 | if ( $fileCount ) { |
| — | — | @@ -683,7 +683,7 @@ |
| 684 | 684 | $subcatCount, |
| 685 | 685 | $pages, |
| 686 | 686 | $fileCount, |
| 687 | | - $pageCount, |
| | 687 | + $allCount, |
| 688 | 688 | $memberNumsShort ) ); |
| 689 | 689 | } |
| 690 | 690 | |