| Index: branches/REL1_19/extensions/UploadWizard/UploadWizard.i18n.php |
| — | — | @@ -38,7 +38,7 @@ |
| 39 | 39 | 'mwe-upwiz-help-desk' => 'Help Desk', |
| 40 | 40 | 'mwe-upwiz-help-desk-url' => 'Help Desk', |
| 41 | 41 | 'mwe-upwiz-add-file-n' => 'Add another file', |
| 42 | | - 'mwe-upwiz-add-file-0-free' => 'Drop media file to donate here', |
| | 42 | + 'mwe-upwiz-add-file-0-free' => 'Select a media file to donate', |
| 43 | 43 | 'mwe-upwiz-transport-started' => 'Starting...', |
| 44 | 44 | 'mwe-upwiz-uploading' => 'Uploading...', |
| 45 | 45 | 'mwe-upwiz-transported' => 'Finished uploading...', |
| Property changes on: branches/REL1_19/extensions/UploadWizard |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 46 | 46 | Merged /trunk/extensions/UploadWizard:r112517,112562 |
| Index: branches/REL1_19/extensions/CentralAuth/specials/SpecialMergeAccount.php |
| — | — | @@ -57,16 +57,22 @@ |
| 58 | 58 | switch( $this->mMergeAction ) { |
| 59 | 59 | case "dryrun": |
| 60 | 60 | $this->doDryRunMerge(); |
| | 61 | + break; |
| 61 | 62 | case "initial": |
| 62 | 63 | $this->doInitialMerge(); |
| | 64 | + break; |
| 63 | 65 | case "cleanup": |
| 64 | 66 | $this->doCleanupMerge(); |
| | 67 | + break; |
| 65 | 68 | case "attach": |
| 66 | 69 | $this->doAttachMerge(); |
| | 70 | + break; |
| 67 | 71 | case "remove": |
| 68 | | - $this->doUnattach(); |
| | 72 | + $this->doUnattach(); // FIXME: Method is undefined |
| | 73 | + break; |
| 69 | 74 | default: |
| 70 | | - $this->invalidAction(); |
| | 75 | + $this->invalidAction(); // FIXME: Method is undefined |
| | 76 | + break; |
| 71 | 77 | } |
| 72 | 78 | return; |
| 73 | 79 | } |
| Index: branches/REL1_19/extensions/DoubleWiki/DoubleWiki_body.php |
| — | — | @@ -66,60 +66,59 @@ |
| 67 | 67 | $nt = Title::newFromText( $l ); |
| 68 | 68 | $iw = $nt->getInterwiki(); |
| 69 | 69 | |
| 70 | | - if ( $iw !== $match_request ) { |
| 71 | | - continue; |
| 72 | | - } |
| 73 | | - $key = wfMemcKey( 'doublewiki', $wgLang->getCode(), $nt->getPrefixedDbKey() ); |
| 74 | | - $cachedText = $wgMemc->get( $key ); |
| | 70 | + if ( $iw === $match_request ) { |
| 75 | 71 | |
| 76 | | - if( $cachedText ) { |
| 77 | | - $text = $cachedText; |
| 78 | | - } else { |
| 79 | | - $url = $nt->getCanonicalURL(); |
| 80 | | - $myURL = $out->getTitle()->getLocalURL(); |
| 81 | | - $languageName = $wgContLang->getLanguageName( $iw ); |
| 82 | | - $myLanguage = $wgLang->getLanguageName( $wgContLang->getCode() ); |
| 83 | | - $translation = Http::get( wfAppendQuery( $url, array( 'action' => 'render' ) ) ); |
| | 72 | + $key = wfMemcKey( 'doublewiki', $wgLang->getCode(), $nt->getPrefixedDbKey() ); |
| | 73 | + $cachedText = $wgMemc->get( $key ); |
| 84 | 74 | |
| 85 | | - if ( $translation !== null ) { |
| 86 | | - break; |
| 87 | | - } |
| 88 | | - /** |
| 89 | | - * first find all links that have no 'class' parameter. |
| 90 | | - * these links are local so we add '?match=xx' to their url, |
| 91 | | - * unless it already contains a '?' |
| 92 | | - */ |
| 93 | | - $translation = preg_replace( |
| 94 | | - "/<a href=\"http:\/\/([^\"\?]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i", |
| 95 | | - "<a href=\"http://\\1?match={$wgContLanguageCode}\"\\2>", $translation ); |
| 96 | | - // now add class='extiw' to these links |
| 97 | | - $translation = preg_replace( |
| 98 | | - "/<a href=\"http:\/\/([^\"]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i", |
| 99 | | - "<a href=\"http://\\1\" class=\"extiw\"\\3>", $translation ); |
| 100 | | - // use class='extiw' for images too |
| 101 | | - $translation = preg_replace( |
| 102 | | - "/<a href=\"http:\/\/([^\"]*)\"([^\>]*)class=\"image\"([^\>]*)\>/i", |
| 103 | | - "<a href=\"http://\\1\"\\2class=\"extiw\"\\3>", $translation ); |
| | 75 | + if( $cachedText ) { |
| | 76 | + $text = $cachedText; |
| | 77 | + } else { |
| | 78 | + $url = $nt->getCanonicalURL(); |
| | 79 | + $myURL = $out->getTitle()->getLocalURL(); |
| | 80 | + $languageName = $wgContLang->getLanguageName( $iw ); |
| | 81 | + $myLanguage = $wgLang->getLanguageName( $wgContLang->getCode() ); |
| | 82 | + $translation = Http::get( wfAppendQuery( $url, array( 'action' => 'render' ) ) ); |
| 104 | 83 | |
| 105 | | - // add prefixes to internal links, in order to prevent duplicates |
| 106 | | - $translation = preg_replace( "/<a href=\"#(.*?)\"/i", "<a href=\"#l_\\1\"", |
| 107 | | - $translation ); |
| 108 | | - $translation = preg_replace( "/<li id=\"(.*?)\"/i", "<li id=\"l_\\1\"", |
| 109 | | - $translation ); |
| 110 | | - $text = preg_replace( "/<a href=\"#(.*?)\"/i", "<a href=\"#r_\\1\"", $text ); |
| 111 | | - $text = preg_replace( "/<li id=\"(.*?)\"/i", "<li id=\"r_\\1\"", $text ); |
| | 84 | + if ( $translation !== null ) { |
| | 85 | + /** |
| | 86 | + * first find all links that have no 'class' parameter. |
| | 87 | + * these links are local so we add '?match=xx' to their url, |
| | 88 | + * unless it already contains a '?' |
| | 89 | + */ |
| | 90 | + $translation = preg_replace( |
| | 91 | + "/<a href=\"http:\/\/([^\"\?]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i", |
| | 92 | + "<a href=\"http://\\1?match={$wgContLanguageCode}\"\\2>", $translation ); |
| | 93 | + // now add class='extiw' to these links |
| | 94 | + $translation = preg_replace( |
| | 95 | + "/<a href=\"http:\/\/([^\"]*)\"(([\s]+)(c(?!lass=)|[^c\>\s])([^\>\s]*))*\>/i", |
| | 96 | + "<a href=\"http://\\1\" class=\"extiw\"\\3>", $translation ); |
| | 97 | + // use class='extiw' for images too |
| | 98 | + $translation = preg_replace( |
| | 99 | + "/<a href=\"http:\/\/([^\"]*)\"([^\>]*)class=\"image\"([^\>]*)\>/i", |
| | 100 | + "<a href=\"http://\\1\"\\2class=\"extiw\"\\3>", $translation ); |
| 112 | 101 | |
| 113 | | - // add ?match= to local links of the local wiki |
| 114 | | - $text = preg_replace( "/<a href=\"\/([^\"\?]*)\"/i", |
| 115 | | - "<a href=\"/\\1?match={$match_request}\"", $text ); |
| | 102 | + // add prefixes to internal links, in order to prevent duplicates |
| | 103 | + $translation = preg_replace( "/<a href=\"#(.*?)\"/i", "<a href=\"#l_\\1\"", |
| | 104 | + $translation ); |
| | 105 | + $translation = preg_replace( "/<li id=\"(.*?)\"/i", "<li id=\"l_\\1\"", |
| | 106 | + $translation ); |
| | 107 | + $text = preg_replace( "/<a href=\"#(.*?)\"/i", "<a href=\"#r_\\1\"", $text ); |
| | 108 | + $text = preg_replace( "/<li id=\"(.*?)\"/i", "<li id=\"r_\\1\"", $text ); |
| 116 | 109 | |
| 117 | | - // do the job |
| 118 | | - $text = $this->matchColumns ( $text, $myLanguage, $myURL, $wgContLanguageCode, |
| 119 | | - $translation, $languageName, $url, $match_request ); |
| | 110 | + // add ?match= to local links of the local wiki |
| | 111 | + $text = preg_replace( "/<a href=\"\/([^\"\?]*)\"/i", |
| | 112 | + "<a href=\"/\\1?match={$match_request}\"", $text ); |
| 120 | 113 | |
| 121 | | - $wgMemc->set( $key, $text, $wgDoubleWikiCacheTime ); |
| | 114 | + // do the job |
| | 115 | + $text = $this->matchColumns ( $text, $myLanguage, $myURL, $wgContLanguageCode, |
| | 116 | + $translation, $languageName, $url, $match_request ); |
| | 117 | + |
| | 118 | + $wgMemc->set( $key, $text, $wgDoubleWikiCacheTime ); |
| | 119 | + } |
| | 120 | + } |
| | 121 | + break; |
| 122 | 122 | } |
| 123 | | - break; |
| 124 | 123 | } |
| 125 | 124 | return true; |
| 126 | 125 | } |
| Index: branches/REL1_19/extensions/CheckUser/SpecialCheckUserLog.php |
| — | — | @@ -60,6 +60,10 @@ |
| 61 | 61 | } |
| 62 | 62 | } |
| 63 | 63 | } |
| | 64 | + |
| | 65 | + $out->addHTML( $this->getSkin()->makeKnownLinkObj( |
| | 66 | + Title::makeTitle( NS_SPECIAL, 'CheckUser' ), |
| | 67 | + wfMsgHtml( 'checkuser-log-return' ) ) ); |
| 64 | 68 | |
| 65 | 69 | $searchTypes = array( 'initiator', 'target' ); |
| 66 | 70 | $select = "<select name=\"cuSearchType\" style='margin-top:.2em;'>\n"; |
| Index: branches/REL1_19/extensions/Vector/Vector.php |
| — | — | @@ -125,6 +125,7 @@ |
| 126 | 126 | 'jquery.suggestions', |
| 127 | 127 | 'jquery.autoEllipsis', |
| 128 | 128 | 'jquery.placeholder', |
| | 129 | + 'mediawiki.legacy.mwsuggest', // to ensure we disable it in proper order |
| 129 | 130 | ), |
| 130 | 131 | ), |
| 131 | 132 | ); |
| Property changes on: branches/REL1_19/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 132 | 133 | Merged /trunk/extensions:r112074,112153,112160,112295,112517,112562 |