https://www.mediawiki.org/wiki/Special:Code/MediaWiki/112648
Revision: 112648
Author: reedy
Date: 2012-02-28 21:43:05 +0000 (Tue, 28 Feb 2012)
Log Message:
-----------
MFT r112074, r112153, r112295, r112517, r112562, r112628
Modified Paths:
--------------
branches/REL1_19/extensions/CentralAuth/specials/SpecialMergeAccount.php
branches/REL1_19/extensions/CheckUser/SpecialCheckUserLog.php
branches/REL1_19/extensions/DoubleWiki/DoubleWiki_body.php
branches/REL1_19/extensions/UploadWizard/UploadWizard.i18n.php
branches/REL1_19/extensions/Vector/Vector.php
Property Changed:
----------------
branches/REL1_19/extensions/
branches/REL1_19/extensions/UploadWizard/
Property changes on: branches/REL1_19/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions:111199,111218,111484,111575,111685,111713,111715
+
/trunk/extensions:111199,111218,111484,111575,111685,111713,111715,112074,112153,112160,112295,112517,112562
Modified:
branches/REL1_19/extensions/CentralAuth/specials/SpecialMergeAccount.php
===================================================================
--- branches/REL1_19/extensions/CentralAuth/specials/SpecialMergeAccount.php
2012-02-28 21:21:46 UTC (rev 112647)
+++ branches/REL1_19/extensions/CentralAuth/specials/SpecialMergeAccount.php
2012-02-28 21:43:05 UTC (rev 112648)
@@ -57,16 +57,22 @@
switch( $this->mMergeAction ) {
case "dryrun":
$this->doDryRunMerge();
+ break;
case "initial":
$this->doInitialMerge();
+ break;
case "cleanup":
$this->doCleanupMerge();
+ break;
case "attach":
$this->doAttachMerge();
+ break;
case "remove":
- $this->doUnattach();
+ $this->doUnattach(); // FIXME: Method is
undefined
+ break;
default:
- $this->invalidAction();
+ $this->invalidAction(); // FIXME: Method is
undefined
+ break;
}
return;
}
Modified: branches/REL1_19/extensions/CheckUser/SpecialCheckUserLog.php
===================================================================
--- branches/REL1_19/extensions/CheckUser/SpecialCheckUserLog.php
2012-02-28 21:21:46 UTC (rev 112647)
+++ branches/REL1_19/extensions/CheckUser/SpecialCheckUserLog.php
2012-02-28 21:43:05 UTC (rev 112648)
@@ -60,6 +60,10 @@
}
}
}
+
+ $out->addHTML( $this->getSkin()->makeKnownLinkObj(
+ Title::makeTitle( NS_SPECIAL, 'CheckUser' ),
+ wfMsgHtml( 'checkuser-log-return' ) ) );
$searchTypes = array( 'initiator', 'target' );
$select = "<select name=\"cuSearchType\"
style='margin-top:.2em;'>\n";
Modified: branches/REL1_19/extensions/DoubleWiki/DoubleWiki_body.php
===================================================================
--- branches/REL1_19/extensions/DoubleWiki/DoubleWiki_body.php 2012-02-28
21:21:46 UTC (rev 112647)
+++ branches/REL1_19/extensions/DoubleWiki/DoubleWiki_body.php 2012-02-28
21:43:05 UTC (rev 112648)
@@ -66,60 +66,59 @@
$nt = Title::newFromText( $l );
$iw = $nt->getInterwiki();
- if ( $iw !== $match_request ) {
- continue;
- }
- $key = wfMemcKey( 'doublewiki', $wgLang->getCode(),
$nt->getPrefixedDbKey() );
- $cachedText = $wgMemc->get( $key );
+ if ( $iw === $match_request ) {
- if( $cachedText ) {
- $text = $cachedText;
- } else {
- $url = $nt->getCanonicalURL();
- $myURL = $out->getTitle()->getLocalURL();
- $languageName = $wgContLang->getLanguageName(
$iw );
- $myLanguage = $wgLang->getLanguageName(
$wgContLang->getCode() );
- $translation = Http::get( wfAppendQuery( $url,
array( 'action' => 'render' ) ) );
+ $key = wfMemcKey( 'doublewiki',
$wgLang->getCode(), $nt->getPrefixedDbKey() );
+ $cachedText = $wgMemc->get( $key );
- if ( $translation !== null ) {
- break;
- }
- /**
- * first find all links that have no 'class'
parameter.
- * these links are local so we add '?match=xx'
to their url,
- * unless it already contains a '?'
- */
- $translation = preg_replace(
- "/<a
href=\"http:\/\/([^\"\?]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i",
- "<a
href=\"http://\\1?match={$wgContLanguageCode}\"\\2>", $translation );
- // now add class='extiw' to these links
- $translation = preg_replace(
- "/<a
href=\"http:\/\/([^\"]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i",
- "<a href=\"http://\\1\";
class=\"extiw\"\\3>", $translation );
- // use class='extiw' for images too
- $translation = preg_replace(
- "/<a
href=\"http:\/\/([^\"]*)\"([^\>]*)class=\"image\"([^\>]*)\>/i",
- "<a
href=\"http://\\1\"\\2class=\"extiw\"\\3>", $translation );
+ if( $cachedText ) {
+ $text = $cachedText;
+ } else {
+ $url = $nt->getCanonicalURL();
+ $myURL =
$out->getTitle()->getLocalURL();
+ $languageName =
$wgContLang->getLanguageName( $iw );
+ $myLanguage = $wgLang->getLanguageName(
$wgContLang->getCode() );
+ $translation = Http::get(
wfAppendQuery( $url, array( 'action' => 'render' ) ) );
- // add prefixes to internal links, in order to
prevent duplicates
- $translation = preg_replace( "/<a
href=\"#(.*?)\"/i", "<a href=\"#l_\\1\"",
- $translation );
- $translation = preg_replace( "/<li
id=\"(.*?)\"/i", "<li id=\"l_\\1\"",
- $translation );
- $text = preg_replace( "/<a href=\"#(.*?)\"/i",
"<a href=\"#r_\\1\"", $text );
- $text = preg_replace( "/<li id=\"(.*?)\"/i",
"<li id=\"r_\\1\"", $text );
+ if ( $translation !== null ) {
+ /**
+ * first find all links that
have no 'class' parameter.
+ * these links are local so we
add '?match=xx' to their url,
+ * unless it already contains a
'?'
+ */
+ $translation = preg_replace(
+ "/<a
href=\"http:\/\/([^\"\?]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i",
+ "<a
href=\"http://\\1?match={$wgContLanguageCode}\"\\2>", $translation );
+ // now add class='extiw' to
these links
+ $translation = preg_replace(
+ "/<a
href=\"http:\/\/([^\"]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i",
+ "<a href=\"http://\\1\";
class=\"extiw\"\\3>", $translation );
+ // use class='extiw' for images
too
+ $translation = preg_replace(
+ "/<a
href=\"http:\/\/([^\"]*)\"([^\>]*)class=\"image\"([^\>]*)\>/i",
+ "<a
href=\"http://\\1\"\\2class=\"extiw\"\\3>", $translation );
- // add ?match= to local links of the local wiki
- $text = preg_replace( "/<a
href=\"\/([^\"\?]*)\"/i",
- "<a
href=\"/\\1?match={$match_request}\"", $text );
+ // add prefixes to internal
links, in order to prevent duplicates
+ $translation = preg_replace(
"/<a href=\"#(.*?)\"/i", "<a href=\"#l_\\1\"",
+
$translation );
+ $translation = preg_replace(
"/<li id=\"(.*?)\"/i", "<li id=\"l_\\1\"",
+
$translation );
+ $text = preg_replace( "/<a
href=\"#(.*?)\"/i", "<a href=\"#r_\\1\"", $text );
+ $text = preg_replace( "/<li
id=\"(.*?)\"/i", "<li id=\"r_\\1\"", $text );
- // do the job
- $text = $this->matchColumns ( $text,
$myLanguage, $myURL, $wgContLanguageCode,
- $translation,
$languageName, $url, $match_request );
+ // add ?match= to local links
of the local wiki
+ $text = preg_replace( "/<a
href=\"\/([^\"\?]*)\"/i",
+ "<a
href=\"/\\1?match={$match_request}\"", $text );
- $wgMemc->set( $key, $text,
$wgDoubleWikiCacheTime );
+ // do the job
+ $text = $this->matchColumns (
$text, $myLanguage, $myURL, $wgContLanguageCode,
+
$translation, $languageName, $url, $match_request );
+
+ $wgMemc->set( $key, $text,
$wgDoubleWikiCacheTime );
+ }
+ }
+ break;
}
- break;
}
return true;
}
Property changes on: branches/REL1_19/extensions/UploadWizard
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/phase3/extensions/UploadWizard:85939
+ /branches/uploadwizard/extensions/UploadWizard:73550-75905
/trunk/extensions/UploadWizard:112517,112562
/trunk/phase3/extensions/UploadWizard:85939
Modified: branches/REL1_19/extensions/UploadWizard/UploadWizard.i18n.php
===================================================================
--- branches/REL1_19/extensions/UploadWizard/UploadWizard.i18n.php
2012-02-28 21:21:46 UTC (rev 112647)
+++ branches/REL1_19/extensions/UploadWizard/UploadWizard.i18n.php
2012-02-28 21:43:05 UTC (rev 112648)
@@ -38,7 +38,7 @@
'mwe-upwiz-help-desk' => 'Help Desk',
'mwe-upwiz-help-desk-url' => 'Help Desk',
'mwe-upwiz-add-file-n' => 'Add another file',
- 'mwe-upwiz-add-file-0-free' => 'Drop media file to donate here',
+ 'mwe-upwiz-add-file-0-free' => 'Select a media file to donate',
'mwe-upwiz-transport-started' => 'Starting...',
'mwe-upwiz-uploading' => 'Uploading...',
'mwe-upwiz-transported' => 'Finished uploading...',
Modified: branches/REL1_19/extensions/Vector/Vector.php
===================================================================
--- branches/REL1_19/extensions/Vector/Vector.php 2012-02-28 21:21:46 UTC
(rev 112647)
+++ branches/REL1_19/extensions/Vector/Vector.php 2012-02-28 21:43:05 UTC
(rev 112648)
@@ -125,6 +125,7 @@
'jquery.suggestions',
'jquery.autoEllipsis',
'jquery.placeholder',
+ 'mediawiki.legacy.mwsuggest', // to ensure we disable
it in proper order
),
),
);
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
