http://www.mediawiki.org/wiki/Special:Code/MediaWiki/97535
Revision: 97535
Author: jeroendedauw
Date: 2011-09-19 18:45:16 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
fix bug 30761
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/RELEASE-NOTES
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Category.php
Modified: trunk/extensions/SemanticMediaWiki/RELEASE-NOTES
===================================================================
--- trunk/extensions/SemanticMediaWiki/RELEASE-NOTES 2011-09-19 18:39:24 UTC
(rev 97534)
+++ trunk/extensions/SemanticMediaWiki/RELEASE-NOTES 2011-09-19 18:45:16 UTC
(rev 97535)
@@ -14,7 +14,7 @@
* Fixed display of properties of type URL (bug 30912).
* Fixed hide query functionality on Special:Ask (bug 30768).
* Fixed display of internal SMW helper constants in certain queries (bug
30969).
-* Fixed some issue with the category result format (including bug 30761).
+* Fixed some issues with the category result format (including bug 30761).
== SMW 1.6.1 ==
Modified:
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Category.php
===================================================================
---
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Category.php
2011-09-19 18:39:24 UTC (rev 97534)
+++
trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_Category.php
2011-09-19 18:45:16 UTC (rev 97535)
@@ -72,9 +72,13 @@
$nextrow = $res->getNext(); // look ahead
$content = $row[0]->getContent();
- $sortkey = $res->getStore()->getWikiPageSortKey(
$content[0] );
- $cur_first_char = $wgContLang->firstChar( $sortkey ==
'' ? $content[0]->getDBkey() : $sortkey );
+ $cur_first_char = $wgContLang->firstChar(
+ $content[0]->getDIType() ==
SMWDataItem::TYPE_WIKIPAGE ?
+ $res->getStore()->getWikiPageSortKey(
$content[0] )
+ : $content[0]->getSortKey()
+ );
+
if ( $rowindex % $rows_per_column == 0 ) {
$result .= "\n <div
style=\"float: left; width: $column_width%;\">\n";
if ( $cur_first_char == $prev_first_char )
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
