Merge commit '63865eb39f' into WebGUI8. up to 7.9.11

2010-08-13 11:52:08 -07:00 · 2010-08-13 11:52:08 -07:00 · 7b218942b3
commit 7b218942b3
parent f51ef19889 63865eb39f
72 changed files with 3085 additions and 407 deletions
--- a/lib/WebGUI/Asset/Wobject/WikiMaster.pm
+++ b/lib/WebGUI/Asset/Wobject/WikiMaster.pm
@ -554,7 +554,11 @@ sub getKeywordHierarchy {
        my $datum = {
            title       => $keyword,  ##Note, same as keyword
            url         => $self->getUrl('func=byKeyword;keyword='.$keyword),
-            descendants => scalar @{ $assetKeyword->getMatchingAssets( { startAsset => $self, keyword => $keyword, }) },
+            descendants => scalar @{ $assetKeyword->getMatchingAssets( {
+                                        startAsset => $self,
+                                        keyword    => $keyword,
+                                        sortOrder  => 'Alphabetically',
+                                  }) },
        };
        ##Prevent recursion if seen again
        if (! $seen->{$keyword}++) {