| Index: trunk/extensions/SemanticMediaWiki/RELEASE-NOTES |
| — | — | @@ -1,6 +1,15 @@ |
| 2 | 2 | For a documentation of all features, see http://semantic-mediawiki.org |
| 3 | 3 | |
| 4 | 4 | |
| | 5 | +== SMW 1.7.1 == |
| | 6 | + |
| | 7 | +THIS IS NOT A RELEASE YET |
| | 8 | + |
| | 9 | +Semantic MediaWiki 1.7.1 is currently in beta-quality and is not recommended for use in |
| | 10 | +production until the actual release. |
| | 11 | + |
| | 12 | +* Fixed bug in "further results" links causing the main column to be displayed twice on Special:Ask. |
| | 13 | + |
| 5 | 14 | == SMW 1.7 == |
| 6 | 15 | |
| 7 | 16 | Released on January 1, 2012. |
| — | — | @@ -31,12 +40,12 @@ |
| 32 | 41 | * Fixed some issues with the category result format (including bug 30761). |
| 33 | 42 | * Fixed email validation issue (bug 32295). |
| 34 | 43 | * Fixed incorrect handling of sort and order parameters on Special:Ask (bug 32706). |
| 35 | | -* Fixed display of images to old behavior after a recent regression. |
| 36 | | -* Fixed several more issues not listed here. |
| | 44 | +* Fixed display of images to old behaviour after a recent regression. |
| 37 | 45 | * Fixed fatal error in the concept cache maintenance script (bug 32592). |
| 38 | 46 | * Fixed factbox links to Special:SearchByProperty containing numerical numbers for |
| 39 | 47 | wikis in languages with the comma as decimal separator instead of a dot. |
| 40 | 48 | * Fixed the "hide incoming properties" link on Special:Browse. |
| | 49 | +* Fixed several more issues not listed here. |
| 41 | 50 | * Dropped compatibility with MediaWiki 1.15.x (and earlier). |
| 42 | 51 | * Dropped compatibility with old-style (SMW < 1.6) query printers. |
| 43 | 52 | * Full compatibility with MediaWiki 1.18 and foreward-compatibility with 1.19. |
| Index: trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QueryPrinter.php |
| — | — | @@ -451,7 +451,7 @@ |
| 452 | 452 | * @return boolean |
| 453 | 453 | */ |
| 454 | 454 | protected function linkFurtherResults( $results ) { |
| 455 | | - return ( $this->mInline && $results->hasFurtherResults() && ( $this->mSearchlabel !== '' ) ); |
| | 455 | + return $this->mInline && $results->hasFurtherResults() && $this->mSearchlabel !== ''; |
| 456 | 456 | } |
| 457 | 457 | |
| 458 | 458 | /** |
| Index: trunk/extensions/SemanticMediaWiki/includes/storage/SMW_QueryResult.php |
| — | — | @@ -193,6 +193,9 @@ |
| 194 | 194 | * can also be changed afterwards with SMWInfolink::setCaption()). If empty, the |
| 195 | 195 | * message 'smw_iq_moreresults' is used as a caption. |
| 196 | 196 | * |
| | 197 | + * TODO: have this work for all params without manually overriding and adding everything |
| | 198 | + * (this is possible since the param handling changes in 1.7) |
| | 199 | + * |
| 197 | 200 | * @param mixed $caption A caption string or false |
| 198 | 201 | * |
| 199 | 202 | * @return SMWInfolink |
| — | — | @@ -200,11 +203,19 @@ |
| 201 | 204 | public function getQueryLink( $caption = false ) { |
| 202 | 205 | $params = array( trim( $this->mQuery->getQueryString() ) ); |
| 203 | 206 | |
| 204 | | - foreach ( $this->mQuery->getExtraPrintouts() as $printout ) { |
| 205 | | - $params[] = $printout->getSerialisation(); |
| | 207 | + foreach ( $this->mQuery->getExtraPrintouts() as /* SMWPrintRequest */ $printout ) { |
| | 208 | + $serialization = $printout->getSerialisation(); |
| | 209 | + |
| | 210 | + // TODO: this is a hack to get rid of the mainlabel param in case it was automatically added |
| | 211 | + // by SMWQueryProcessor::addThisPrintout. Should be done nicer when this link creation gets redone. |
| | 212 | + if ( $serialization !== '?#' ) { |
| | 213 | + $params[] = $serialization; |
| | 214 | + } |
| 206 | 215 | } |
| 207 | 216 | |
| 208 | | - $params['mainlabel'] = $this->mQuery->getMainLabel(); |
| | 217 | + if ( $this->mQuery->getMainLabel() !== false ) { |
| | 218 | + $params['mainlabel'] = $this->mQuery->getMainLabel(); |
| | 219 | + } |
| 209 | 220 | |
| 210 | 221 | if ( count( $this->mQuery->sortkeys ) > 0 ) { |
| 211 | 222 | $order = implode( ',', $this->mQuery->sortkeys ); |
| Index: trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.php |
| — | — | @@ -34,7 +34,7 @@ |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | // The SMW version number. |
| 38 | | -define( 'SMW_VERSION', '1.7' ); |
| | 38 | +define( 'SMW_VERSION', '1.7.1 alpha' ); |
| 39 | 39 | |
| 40 | 40 | // Registration of the extension credits, see Special:Version. |
| 41 | 41 | $wgExtensionCredits['semantic'][] = array( |