http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88529
Revision: 88529
Author: robin
Date: 2011-05-21 18:53:54 +0000 (Sat, 21 May 2011)
Log Message:
-----------
Make onRcQuery() use buildLike() (the OR ... is not needed actually)
Modified Paths:
--------------
trunk/extensions/WikimediaIncubator/TestWikiRC.php
trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
Modified: trunk/extensions/WikimediaIncubator/TestWikiRC.php
===================================================================
--- trunk/extensions/WikimediaIncubator/TestWikiRC.php 2011-05-21 18:42:52 UTC
(rev 88528)
+++ trunk/extensions/WikimediaIncubator/TestWikiRC.php 2011-05-21 18:53:54 UTC
(rev 88529)
@@ -8,7 +8,7 @@
global $wgUser, $wgRequest, $wmincPref, $wmincProjectSite,
$wmincTestWikiNamespaces;
$projectvalue = strtolower( $wgRequest->getVal(
'rc-testwiki-project', $wgUser->getOption($wmincPref . '-project') ) );
$codevalue = strtolower( $wgRequest->getVal(
'rc-testwiki-code', $wgUser->getOption($wmincPref . '-code') ) );
- $fullprefix = IncubatorTest::displayPrefix( $projectvalue,
$codevalue );
+ $prefix = IncubatorTest::displayPrefix( $projectvalue,
$codevalue );
$opts->add( 'rc-testwiki-project', false );
$opts->setValue( 'rc-testwiki-project', $projectvalue );
$opts->add( 'rc-testwiki-code', false );
@@ -18,16 +18,16 @@
return true;
} elseif ( $projectvalue == $wmincProjectSite['short'] ) {
// If project site is selected, display all changes
except test wiki changes
- $conds[] = 'rc_title not like \'W_/%%\' OR
\'W_/%%/%%\'';
- return true;
+ $dbr = wfGetDB( DB_SLAVE );
+ $conds[] = 'rc_title NOT ' . $dbr->buildLike( 'W',
$dbr->anyChar(), '/', $dbr->anyString() );
} else {
- // Else, display changes to the selected test wiki (in
main, template and category namespace)
+ // Else, display changes to the selected test wiki in
the appropriate namespaces
$dbr = wfGetDB( DB_SLAVE );
$conds['rc_namespace'] = $wmincTestWikiNamespaces;
- $conds[] = 'rc_title ' . $dbr->buildLike( $fullprefix .
'/', $dbr->anyString() ) .
- ' OR rc_title = ' . $dbr->addQuotes( $fullprefix );
- return true;
+ $conds[] = 'rc_title ' . $dbr->buildLike( $prefix .
'/', $dbr->anyString() ) .
+ ' OR rc_title = ' . $dbr->addQuotes( $prefix );
}
+ return true;
}
static function onRcForm( &$items, $opts ) {
Modified: trunk/extensions/WikimediaIncubator/WikimediaIncubator.php
===================================================================
--- trunk/extensions/WikimediaIncubator/WikimediaIncubator.php 2011-05-21
18:42:52 UTC (rev 88528)
+++ trunk/extensions/WikimediaIncubator/WikimediaIncubator.php 2011-05-21
18:53:54 UTC (rev 88529)
@@ -1,7 +1,9 @@
<?php
if ( !defined( 'MEDIAWIKI' ) ) { die( "This file is an extension to the
MediaWiki software and cannot be used standalone.\n" ); }
/**
- * An extension that adds test wiki features (such as a preference, recent
changes for a test wiki, ...) specifically for the Wikimedia Incubator
+ * An extension that adds features (such as a preference, recent changes, ...)
+ * for a test wiki system (i.e. incubated wikis inside one actual wiki)
+ * mainly intended for the Wikimedia Incubator
*
* @file
* @ingroup Extensions
@@ -11,7 +13,7 @@
'path' => __FILE__,
'name' => 'Wikimedia Incubator',
'author' => 'SPQRobin',
- 'version' => '3.0',
+ 'version' => '3.0.1',
'url' => 'http://www.mediawiki.org/wiki/Extension:WikimediaIncubator',
'descriptionmsg' => 'wminc-desc',
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
