Index: branches/wmf/1.18wmf1/extensions/ExtensionDistributor/ExtensionDistributor_body.php |
— | — | @@ -198,17 +198,13 @@ |
199 | 199 | Xml::closeElement( 'select' ) . ' ' . |
200 | 200 | Xml::submitButton( wfMsg( 'extdist-submit-version' ), array( 'name' => 'extdist_submit' ) ) . |
201 | 201 | Xml::closeElement( 'form' ) . "\n" |
202 | | - ); |
203 | | - |
204 | | - $wgOut->addHtml( '<span style="color:darkred">' . wfMsgExt( 'extdist-trunk-warning', 'parse' ) . '</span>' ); |
| 202 | + ); |
205 | 203 | } |
206 | 204 | |
207 | 205 | protected function doDownload( $extension, $version ) { |
208 | 206 | global $wgExtDistWorkingCopy, $wgExtDistTarDir, $wgExtDistBranches, |
209 | 207 | $wgOut, $wgExtDistTarUrl, $wgExtDistRemoteClient; |
210 | 208 | |
211 | | - $wgOut->addHtml( '<span style="color:darkred">' . wfMsgExt( 'extdist-trunk-warning', 'parse' ) . '</span>' ); |
212 | | - |
213 | 209 | if ( $wgExtDistRemoteClient ) { |
214 | 210 | $rev = $this->updateAndGetRevisionRemote( $extension, $version ); |
215 | 211 | } else { |
Index: branches/wmf/1.18wmf1/extensions/ExtensionDistributor/ExtensionDistributor.i18n.php |
— | — | @@ -47,7 +47,6 @@ |
48 | 48 | |
49 | 49 | If you have any questions about this extension distribution system, please go to [[Extension talk:ExtensionDistributor]].", |
50 | 50 | 'extdist-want-more' => 'Get another extension', |
51 | | - 'extdist-trunk-warning' => "'''Warning''': this tool will get you a development snapshot that might very well '''not work''' with the MediaWiki version you selected or be broken altogether and is likely to be '''out of date'''.", |
52 | 51 | ); |
53 | 52 | |
54 | 53 | /** Message documentation (Message documentation) |
Property changes on: branches/wmf/1.18wmf1/extensions/ExtensionDistributor |
___________________________________________________________________ |
Added: svn:mergeinfo |
55 | 54 | Merged /branches/new-installer/phase3/extensions/ExtensionDistributor:r43664-66004 |
56 | 55 | Merged /branches/REL1_15/phase3/extensions/ExtensionDistributor:r51646 |
57 | 56 | Merged /branches/REL1_17/phase3/extensions/ExtensionDistributor:r81445,81448 |
58 | 57 | Merged /trunk/extensions/ExtensionDistributor:r93896 |
59 | 58 | Merged /branches/sqlite/extensions/ExtensionDistributor:r58211-58321 |
60 | 59 | Merged /trunk/phase3/extensions/ExtensionDistributor:r92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812 |