http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98762
Revision: 98762
Author: reedy
Date: 2011-10-03 13:56:30 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
REL1_18 MFT r97806, r97895, r98193, r98194, r98237, r98502, r98656, r98707,
r98713, r98716, r98718, r98718, r98719, r98720
Modified Paths:
--------------
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/includes/api/ApiQuerySiteinfo.php
branches/REL1_18/phase3/includes/parser/Parser.php
branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
branches/REL1_18/phase3/includes/specials/SpecialBlock.php
branches/REL1_18/phase3/includes/specials/SpecialBlockList.php
branches/REL1_18/phase3/includes/specials/SpecialUserlogin.php
branches/REL1_18/phase3/includes/templates/Userlogin.php
branches/REL1_18/phase3/languages/messages/MessagesEn.php
branches/REL1_18/phase3/maintenance/dumpTextPass.php
branches/REL1_18/phase3/maintenance/language/messageTypes.inc
branches/REL1_18/phase3/maintenance/language/messages.inc
Property Changed:
----------------
branches/REL1_18/phase3/
branches/REL1_18/phase3/RELEASE-NOTES-1.18
branches/REL1_18/phase3/includes/
branches/REL1_18/phase3/includes/api/
branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
branches/REL1_18/phase3/includes/specials/
branches/REL1_18/phase3/includes/specials/SpecialBlock.php
branches/REL1_18/phase3/languages/messages/
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92580,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
+ /branches/REL1_15/phase3:51646
/branches/REL1_17/phase3:81445,81448
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:92580,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,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Modified: branches/REL1_18/phase3/RELEASE-NOTES-1.18
===================================================================
--- branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-10-03 13:41:50 UTC (rev
98761)
+++ branches/REL1_18/phase3/RELEASE-NOTES-1.18 2011-10-03 13:56:30 UTC (rev
98762)
@@ -212,6 +212,9 @@
User:getDefaultOptions().
* (bug 30722) Add an identity collation that sorts things based on what the
unicode code point is (aka pre-1.17 behaviour)
+* (bug 31293) If Special:Userlogin is loaded over HTTPS, display
+ MediaWiki:loginend-https instead of MediaWiki:loginend, if it's not empty.
+ Same for signupend on the account creation page.
=== Bug fixes in 1.18 ===
* mw.util.getScript has been implemented (like wfScript in GlobalFunctions.php)
Property changes on: branches/REL1_18/phase3/RELEASE-NOTES-1.18
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/RELEASE-NOTES-1.18:51646
/branches/REL1_17/phase3/RELEASE-NOTES-1.18:81445,81448
/branches/new-installer/phase3/RELEASE-NOTES-1.18:43664-66004
/branches/sqlite/RELEASE-NOTES-1.18:58211-58321
/trunk/phase3/RELEASE-NOTES-1.18:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93382-93383,93516-93518,93520,93818-93822,93847,93858,93891,93912,93916,93935-93936,94058,94062,94068,94107,94155,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95014,95016-95017,95023,95042,95072-95073,95155,95171,95318,95327,95332,95409-95410,95422,95426,95436,95442,95458,95467-95468,95470,95475,95493,95521,95525,95540,95562,95570,95597,95601,95608,95627,95647-95648,95651-95653,95655-95656,95659,95663,95674,95790,95812,95855,95899,95999,96087,96139,96180,96227-96228,96286,96297,96386,96393,96405,96427,96460,96472,96509,96522,96606,96643,96645,96655,96659,96687,96760,96762,96764-96765,96775,96810,96825,96829,96833,96964,96998,97141,97143,97177,97296,97298,97362,97365,97381,97403,97515,97551-97552,97575,97607-97608,97614,97622-97623,97625,97634,97657,97661
/trunk/phase3/RELEASE-NOTES-1.19:95655,95999
+ /branches/REL1_15/phase3/RELEASE-NOTES-1.18:51646
/branches/REL1_17/phase3/RELEASE-NOTES-1.18:81445,81448
/branches/new-installer/phase3/RELEASE-NOTES-1.18:43664-66004
/branches/sqlite/RELEASE-NOTES-1.18:58211-58321
/trunk/phase3/RELEASE-NOTES-1.18:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93382-93383,93516-93518,93520,93818-93822,93847,93858,93891,93912,93916,93935-93936,94058,94062,94068,94107,94155,94235-94236,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95014,95016-95017,95023,95042,95072-95073,95155,95171,95318,95327,95332,95409-95410,95422,95426,95436,95442,95458,95467-95468,95470,95475,95493,95521,95525,95540,95562,95570,95597,95601,95608,95627,95647-95648,95651-95653,95655-95656,95659,95663,95674,95790,95812,95855,95899,95999,96087,96139,96180,96227-96228,96286,96297,96386,96393,96405,96427,96460,96472,96509,96522,96606,96643,96645,96655,96659,96687,96760,96762,96764-96765,96775,96810,96825,96829,96833,96964,96998,97141,97143,97177,97296,97298,97362,97365,97381,97403,97515,97551-97552,97575,97607-97608,97614,97622-97623,97625,97634,97657,97661,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
/trunk/phase3/RELEASE-NOTES-1.19:95655,95999
Property changes on: branches/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,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
+ /branches/REL1_15/phase3/includes:51646
/branches/new-installer/phase3/includes:43664-66004
/branches/sqlite/includes:58211-58321
/branches/wmf-deployment/includes:53381
/trunk/phase3/includes:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,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,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Property changes on: branches/REL1_18/phase3/includes/api
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812
+ /branches/REL1_15/phase3/includes/api:51646
/branches/REL1_16/phase3/includes/api:63621-63636,69357
/branches/sqlite/includes/api:58211-58321
/branches/wmf/1.16wmf4/includes/api:69521
/branches/wmf/1.18wmf1/includes/api:97789
/branches/wmf-deployment/includes/api:53381,59952
/trunk/phase3/includes/api:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Modified: branches/REL1_18/phase3/includes/api/ApiQuerySiteinfo.php
===================================================================
--- branches/REL1_18/phase3/includes/api/ApiQuerySiteinfo.php 2011-10-03
13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/includes/api/ApiQuerySiteinfo.php 2011-10-03
13:56:30 UTC (rev 98762)
@@ -284,12 +284,12 @@
if ( isset( $langNames[$row->iw_prefix] ) ) {
$val['language'] = $langNames[$row->iw_prefix];
}
- $val['url'] = wfExpandUrl( $row['iw_url'],
PROTO_CURRENT );
- if( isset( $row['iw_wikiid'] ) ) {
- $val['wikiid'] = $row['iw_wikiid'];
+ $val['url'] = wfExpandUrl( $row->iw_url, PROTO_CURRENT
);
+ if( isset( $row->iw_wikiid ) ) {
+ $val['wikiid'] = $row->iw_wikiid;
}
- if( isset( $row['iw_api'] ) ) {
- $val['api'] = $row['iw_api'];
+ if( isset( $row->iw_api ) ) {
+ $val['api'] = $row->iw_api;
}
$data[] = $val;
Modified: branches/REL1_18/phase3/includes/parser/Parser.php
===================================================================
--- branches/REL1_18/phase3/includes/parser/Parser.php 2011-10-03 13:41:50 UTC
(rev 98761)
+++ branches/REL1_18/phase3/includes/parser/Parser.php 2011-10-03 13:56:30 UTC
(rev 98762)
@@ -2735,10 +2735,8 @@
case 'server':
return $wgServer;
case 'servername':
- wfSuppressWarnings(); # May give an E_WARNING
in PHP < 5.3.3
- $serverName = parse_url( $wgServer,
PHP_URL_HOST );
- wfRestoreWarnings();
- return $serverName ? $serverName : $wgServer;
+ $serverParts = wfParseUrl( $wgServer );
+ return $serverParts && isset(
$serverParts['host'] ) ? $serverParts['host'] : $wgServer;
case 'scriptpath':
return $wgScriptPath;
case 'stylepath':
Modified: branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
===================================================================
--- branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
2011-10-03 13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
2011-10-03 13:56:30 UTC (rev 98762)
@@ -786,4 +786,65 @@
return $retval = $wgRequest->getFuzzyBool( 'debug',
$wgRequest->getCookie( 'resourceLoaderDebug', '',
$wgResourceLoaderDebug ) );
}
+
+ /**
+ * Build a load.php URL
+ * @param $modules array of module names (strings)
+ * @param $lang string Language code
+ * @param $skin string Skin name
+ * @param $user string|null User name. If null, the &user= parameter is
omitted
+ * @param $version string|null Versioning timestamp
+ * @param $debug bool Whether the request should be in debug mode
+ * @param $only string|null &only= parameter
+ * @param $printable bool Printable mode
+ * @param $handheld bool Handheld mode
+ * @param $extraQuery array Extra query parameters to add
+ * @return string URL to load.php. May be protocol-relative (if
$wgLoadScript is procol-relative)
+ */
+ public static function makeLoaderURL( $modules, $lang, $skin, $user =
null, $version = null, $debug = false, $only = null,
+ $printable = false, $handheld = false, $extraQuery =
array() ) {
+ global $wgLoadScript;
+ $query = self::makeLoaderQuery( $modules, $lang, $skin, $user,
$version, $debug,
+ $only, $printable, $handheld, $extraQuery
+ );
+
+ // Prevent the IE6 extension check from being triggered (bug
28840)
+ // by appending a character that's invalid in Windows
extensions ('*')
+ return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ) .
'&*', PROTO_RELATIVE );
+ }
+
+ /**
+ * Build a query array (array representation of query string) for
load.php. Helper
+ * function for makeLoaderURL().
+ * @return array
+ */
+ public static function makeLoaderQuery( $modules, $lang, $skin, $user =
null, $version = null, $debug = false, $only = null,
+ $printable = false, $handheld = false, $extraQuery =
array() ) {
+ $query = array(
+ 'modules' => self::makePackedModulesString( $modules ),
+ 'lang' => $lang,
+ 'skin' => $skin,
+ 'debug' => $debug ? 'true' : 'false',
+ );
+ if ( $user !== null ) {
+ $query['user'] = $user;
+ }
+ if ( $version !== null ) {
+ $query['version'] = $version;
+ }
+ if ( $only !== null ) {
+ $query['only'] = $only;
+ }
+ if ( $printable ) {
+ $query['printable'] = 1;
+ }
+ if ( $handheld ) {
+ $query['handheld'] = 1;
+ }
+ $query += $extraQuery;
+
+ // Make queries uniform in order
+ ksort( $query );
+ return $query;
+ }
}
Property changes on:
branches/REL1_18/phase3/includes/resourceloader/ResourceLoader.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ResourceLoader.php:51646
/branches/new-installer/phase3/includes/ResourceLoader.php:43664-66004
/branches/resourceloader/phase3/includes/ResourceLoader.php:68366-69676,69678-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/includes/ResourceLoader.php:58211-58321
/branches/wmf-deployment/includes/ResourceLoader.php:53381
/trunk/phase3/includes/resourceloader/ResourceLoader.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93626,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,96562,96640,96978,97050
+ /branches/REL1_15/phase3/includes/ResourceLoader.php:51646
/branches/new-installer/phase3/includes/ResourceLoader.php:43664-66004
/branches/resourceloader/phase3/includes/ResourceLoader.php:68366-69676,69678-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/includes/ResourceLoader.php:58211-58321
/branches/wmf-deployment/includes/ResourceLoader.php:53381
/trunk/phase3/includes/resourceloader/ResourceLoader.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93626,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,96562,96640,96978,97050,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Property changes on: branches/REL1_18/phase3/includes/specials
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Modified: branches/REL1_18/phase3/includes/specials/SpecialBlock.php
===================================================================
--- branches/REL1_18/phase3/includes/specials/SpecialBlock.php 2011-10-03
13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/includes/specials/SpecialBlock.php 2011-10-03
13:56:30 UTC (rev 98762)
@@ -92,7 +92,11 @@
$wgOut->setPageTitle( wfMsg( 'blockip-title' ) );
$wgOut->addModules( 'mediawiki.special',
'mediawiki.special.block' );
- $fields = self::getFormFields();
+ $out = $this->getOutput();
+ $out->setPageTitle( wfMsg( 'blockip-title' ) );
+ $out->addModules( array( 'mediawiki.special',
'mediawiki.special.block' ) );
+
+ $fields = $this->getFormFields();
$this->maybeAlterFormDefaults( $fields );
$form = new HTMLForm( $fields, $this->getContext() );
Property changes on: branches/REL1_18/phase3/includes/specials/SpecialBlock.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/specials/SpecialBlockip.php:51646
/branches/sqlite/includes/specials/SpecialBlockip.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialBlockip.php:53381,56967
/trunk/phase3/includes/specials/SpecialBlock.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997
+ /branches/REL1_15/phase3/includes/specials/SpecialBlockip.php:51646
/branches/sqlite/includes/specials/SpecialBlockip.php:58211-58321
/branches/wmf-deployment/includes/specials/SpecialBlockip.php:53381,56967
/trunk/phase3/includes/specials/SpecialBlock.php:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94068,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94728,94825,94862,94995-94997,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Modified: branches/REL1_18/phase3/includes/specials/SpecialBlockList.php
===================================================================
--- branches/REL1_18/phase3/includes/specials/SpecialBlockList.php
2011-10-03 13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/includes/specials/SpecialBlockList.php
2011-10-03 13:56:30 UTC (rev 98762)
@@ -317,7 +317,7 @@
if ( $row->ipb_create_account ) {
$properties[] =
$msg['createaccountblock'];
}
- if ( !$row->ipb_enable_autoblock ) {
+ if ( $row->ipb_user &&
!$row->ipb_enable_autoblock ) {
$properties[] =
$msg['noautoblockblock'];
}
@@ -346,6 +346,7 @@
'fields' => array(
'ipb_id',
'ipb_address',
+ 'ipb_user',
'ipb_by',
'ipb_reason',
'ipb_timestamp',
Modified: branches/REL1_18/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- branches/REL1_18/phase3/includes/specials/SpecialUserlogin.php
2011-10-03 13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/includes/specials/SpecialUserlogin.php
2011-10-03 13:56:30 UTC (rev 98762)
@@ -564,6 +564,10 @@
} else {
$wgAuth->updateUser( $u );
$wgUser = $u;
+ // This should set it for OutputPage and the Skin
+ // which is needed or the personal links will be
+ // wrong.
+ RequestContext::getMain()->setUser( $u );
// Please reset throttle for successful logins, thanks!
if ( $throttleCount ) {
@@ -1030,6 +1034,22 @@
if( $this->mLanguage )
$template->set( 'uselang', $this->mLanguage );
}
+
+ // Use loginend-https for HTTPS requests if it's not blank,
loginend otherwise
+ // Ditto for signupend
+ $usingHTTPS = WebRequest::detectProtocol();
+ $loginendHTTPS = wfMessage( 'loginend-https' );
+ $signupendHTTPS = wfMessage( 'signupend-https' );
+ if ( $usingHTTPS && !$loginendHTTPS->isBlank() ) {
+ $template->set( 'loginend', $loginendHTTPS->parse() );
+ } else {
+ $template->set( 'loginend', wfMessage( 'loginend'
)->parse() );
+ }
+ if ( $usingHTTPS && !$signupendHTTPS->isBlank() ) {
+ $template->set( 'signupend', $signupendHTTPS->parse() );
+ } else {
+ $template->set( 'signupend', wfMessage( 'signupend'
)->parse() );
+ }
// Give authentication and captcha plugins a chance to modify
the form
$wgAuth->modifyUITemplate( $template, $this->mType );
Modified: branches/REL1_18/phase3/includes/templates/Userlogin.php
===================================================================
--- branches/REL1_18/phase3/includes/templates/Userlogin.php 2011-10-03
13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/includes/templates/Userlogin.php 2011-10-03
13:56:30 UTC (rev 98762)
@@ -152,7 +152,7 @@
<?php if( $this->haveData( 'token' ) ) { ?><input type="hidden"
name="wpLoginToken" value="<?php $this->text( 'token' ); ?>" /><?php } ?>
</form>
</div>
-<div id="loginend"><?php $this->msgWiki( 'loginend' ); ?></div>
+<div id="loginend"><?php $this->html( 'loginend' ); ?></div>
<?php
}
@@ -377,7 +377,7 @@
<?php if( $this->haveData( 'token' ) ) { ?><input type="hidden"
name="wpCreateaccountToken" value="<?php $this->text( 'token' ); ?>" /><?php }
?>
</form>
</div>
-<div id="signupend"><?php $this->msgWiki( 'signupend' ); ?></div>
+<div id="signupend"><?php $this->html( 'signupend' ); ?></div>
<?php
}
Property changes on: branches/REL1_18/phase3/languages/messages
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/phase3/languages/messages:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94011,94017-94018,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812
+
/trunk/phase3/languages/messages:92580,92713,92765,92884,92886-92887,92894,92898,92907,92932,93149,93151,93233-93234,93258,93266,93516-93518,93818-93822,93847,93858,93891,93935-93936,94011,94017-94018,94058,94062,94068,94107,94155,94235,94346,94372,94422,94425,94444,94448,94456,94498,94601,94630,94728,94825,94862,94995-94997,95042,95155,95332,95410,95442,95468,95601,95812,97806,97895,98193-98194,98237,98502,98610,98656,98707,98713,98716,98718-98720
Modified: branches/REL1_18/phase3/languages/messages/MessagesEn.php
===================================================================
--- branches/REL1_18/phase3/languages/messages/MessagesEn.php 2011-10-03
13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/languages/messages/MessagesEn.php 2011-10-03
13:56:30 UTC (rev 98762)
@@ -1111,8 +1111,10 @@
To prevent abuse, only one password reminder will be sent per
{{PLURAL:$1|hour|$1 hours}}.',
'loginstart' => '', # do not translate or duplicate this
message to other languages
'loginend' => '', # do not translate or duplicate this
message to other languages
+'loginend-https' => '', # do not translate or duplicate this
message to other languages
'signupstart' => '{{int:loginstart}}', # do not translate or
duplicate this message to other languages
'signupend' => '{{int:loginend}}', # do not translate or
duplicate this message to other languages
+'signupend-https' => '', # do not translate or duplicate this
message to other languages
'mailerror' => 'Error sending mail: $1',
'acct_creation_throttle_hit' => 'Visitors to this wiki using your IP address
have created {{PLURAL:$1|1 account|$1 accounts}} in the last day, which is the
maximum allowed in this time period.
As a result, visitors using this IP address cannot create any more accounts at
the moment.',
Modified: branches/REL1_18/phase3/maintenance/dumpTextPass.php
===================================================================
--- branches/REL1_18/phase3/maintenance/dumpTextPass.php 2011-10-03
13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/maintenance/dumpTextPass.php 2011-10-03
13:56:30 UTC (rev 98762)
@@ -422,12 +422,23 @@
function openSpawn() {
global $IP;
- $cmd = implode( " ",
- array_map( 'wfEscapeShellArg',
- array(
- $this->php,
- "$IP/maintenance/fetchText.php",
- '--wiki', wfWikiID() ) ) );
+ if ( file_exists( "$IP/../multiversion/MWScript.php" ) ) {
+ $cmd = implode( " ",
+ array_map( 'wfEscapeShellArg',
+ array(
+ $this->php,
+
"$IP/../multiversion/MWScript.php",
+ "fetchText.php",
+ '--wiki', wfWikiID() ) ) );
+ }
+ else {
+ $cmd = implode( " ",
+ array_map( 'wfEscapeShellArg',
+ array(
+ $this->php,
+ "$IP/maintenance/fetchText.php",
+ '--wiki', wfWikiID() ) ) );
+ }
$spec = array(
0 => array( "pipe", "r" ),
1 => array( "pipe", "w" ),
Modified: branches/REL1_18/phase3/maintenance/language/messageTypes.inc
===================================================================
--- branches/REL1_18/phase3/maintenance/language/messageTypes.inc
2011-10-03 13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/maintenance/language/messageTypes.inc
2011-10-03 13:56:30 UTC (rev 98762)
@@ -105,6 +105,7 @@
'history_copyright',
'licenses',
'loginstart',
+ 'loginend-https',
'loginend',
'loginlanguagelinks',
'pear-mail-error',
@@ -128,6 +129,7 @@
'signature-anon',
'signupstart',
'signupend',
+ 'signupend-https',
'sitenotice',
'sitesubtitle',
'sitetitle',
Modified: branches/REL1_18/phase3/maintenance/language/messages.inc
===================================================================
--- branches/REL1_18/phase3/maintenance/language/messages.inc 2011-10-03
13:41:50 UTC (rev 98761)
+++ branches/REL1_18/phase3/maintenance/language/messages.inc 2011-10-03
13:56:30 UTC (rev 98762)
@@ -469,8 +469,10 @@
'throttled-mailpassword',
'loginstart',
'loginend',
+ 'loginend-https',
'signupstart',
'signupend',
+ 'signupend-https',
'mailerror',
'acct_creation_throttle_hit',
'emailauthenticated',
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
