http://www.mediawiki.org/wiki/Special:Code/MediaWiki/73643
Revision: 73643
Author: neilk
Date: 2010-09-23 21:08:49 +0000 (Thu, 23 Sep 2010)
Log Message:
-----------
merges from trunk
Modified Paths:
--------------
branches/uploadwizard/extensions/UploadWizard/SessionStash.php
branches/uploadwizard/extensions/UploadWizard/UploadWizardMessages.php
branches/uploadwizard/phase3/RELEASE-NOTES
branches/uploadwizard/phase3/includes/DefaultSettings.php
branches/uploadwizard/phase3/includes/EditPage.php
branches/uploadwizard/phase3/includes/Message.php
branches/uploadwizard/phase3/includes/OutputPage.php
branches/uploadwizard/phase3/includes/ProtectionForm.php
branches/uploadwizard/phase3/includes/ResourceLoader.php
branches/uploadwizard/phase3/includes/ResourceLoaderContext.php
branches/uploadwizard/phase3/includes/WebRequest.php
branches/uploadwizard/phase3/includes/specials/SpecialUserlogin.php
branches/uploadwizard/phase3/skins/common/ajaxwatch.js
branches/uploadwizard/phase3/skins/vector/screen.css
Property Changed:
----------------
branches/uploadwizard/extensions/
branches/uploadwizard/extensions/ContactPageFundraiser/
branches/uploadwizard/extensions/LocalisationUpdate/
branches/uploadwizard/extensions/Translate/data/plural-gettext.txt
branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp-wikis.ini.sample
branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.ini.sample
branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.py
branches/uploadwizard/extensions/XMLRC/client/README
branches/uploadwizard/extensions/XMLRC/generator/
branches/uploadwizard/extensions/XMLRC/generator/README
branches/uploadwizard/extensions/XMLRC/generator/rc2udp.ini.sample
branches/uploadwizard/extensions/XMLRC/generator/rc2udp.py
branches/uploadwizard/phase3/
branches/uploadwizard/phase3/COPYING
branches/uploadwizard/phase3/CREDITS
branches/uploadwizard/phase3/FAQ
branches/uploadwizard/phase3/HISTORY
branches/uploadwizard/phase3/INSTALL
branches/uploadwizard/phase3/README
branches/uploadwizard/phase3/RELEASE-NOTES
branches/uploadwizard/phase3/StartProfiler.sample
branches/uploadwizard/phase3/UPGRADE
branches/uploadwizard/phase3/api.php
branches/uploadwizard/phase3/api.php5
branches/uploadwizard/phase3/bin/
branches/uploadwizard/phase3/cache/
branches/uploadwizard/phase3/config/
branches/uploadwizard/phase3/docs/
branches/uploadwizard/phase3/images/
branches/uploadwizard/phase3/img_auth.php
branches/uploadwizard/phase3/img_auth.php5
branches/uploadwizard/phase3/includes/
branches/uploadwizard/phase3/includes/ChangesList.php
branches/uploadwizard/phase3/includes/ConfEditor.php
branches/uploadwizard/phase3/includes/GlobalFunctions.php
branches/uploadwizard/phase3/includes/HistoryPage.php
branches/uploadwizard/phase3/includes/Interwiki.php
branches/uploadwizard/phase3/includes/OutputPage.php
branches/uploadwizard/phase3/includes/ResourceLoader.php
branches/uploadwizard/phase3/includes/Title.php
branches/uploadwizard/phase3/includes/api/
branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php
branches/uploadwizard/phase3/includes/json/Services_JSON.php
branches/uploadwizard/phase3/includes/specials/
branches/uploadwizard/phase3/index.php
branches/uploadwizard/phase3/index.php5
branches/uploadwizard/phase3/languages/
branches/uploadwizard/phase3/load.php
branches/uploadwizard/phase3/load.php5
branches/uploadwizard/phase3/maintenance/
branches/uploadwizard/phase3/maintenance/archives/
branches/uploadwizard/phase3/maintenance/cleanupTable.inc
branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php
branches/uploadwizard/phase3/maintenance/populateRevisionLength.php
branches/uploadwizard/phase3/maintenance/tables.sql
branches/uploadwizard/phase3/maintenance/tests/
branches/uploadwizard/phase3/math/
branches/uploadwizard/phase3/opensearch_desc.php
branches/uploadwizard/phase3/opensearch_desc.php5
branches/uploadwizard/phase3/php5.php5
branches/uploadwizard/phase3/profileinfo.php
branches/uploadwizard/phase3/redirect.php
branches/uploadwizard/phase3/redirect.php5
branches/uploadwizard/phase3/redirect.phtml
branches/uploadwizard/phase3/resources/
branches/uploadwizard/phase3/serialized/
branches/uploadwizard/phase3/skins/
branches/uploadwizard/phase3/thumb.php
branches/uploadwizard/phase3/thumb.php5
branches/uploadwizard/phase3/trackback.php
branches/uploadwizard/phase3/trackback.php5
branches/uploadwizard/phase3/wiki.phtml
Property changes on: branches/uploadwizard/extensions
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/phase3/extensions:73544-73568
Property changes on: branches/uploadwizard/extensions/ContactPageFundraiser
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/branches/wmf/1.16wmf4/extensions/ContactPageFundraiser:67081
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626
+ /branches/REL1_15/phase3/extensions/ContactPageFundraiser:51646
/branches/wmf/1.16wmf4/extensions/ContactPageFundraiser:67081
/trunk/extensions/ContactPageFundraiser:52859,52871-52872,52876,53191,53205-53206,53272,54715,54758,54762,54778,54781,54786,54810-54811,55178
/trunk/phase3/ContactPageFundraiser:52859,53272
/trunk/phase3/extensions/ContactPageFundraiser:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,73544-73568
Property changes on: branches/uploadwizard/extensions/LocalisationUpdate
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/phase3/extensions/LocalisationUpdate:55198
+ /trunk/phase3/extensions/LocalisationUpdate:55198,73544-73568
Property changes on:
branches/uploadwizard/extensions/Translate/data/plural-gettext.txt
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/uploadwizard/extensions/UploadWizard/SessionStash.php
===================================================================
--- branches/uploadwizard/extensions/UploadWizard/SessionStash.php
2010-09-23 21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/extensions/UploadWizard/SessionStash.php
2010-09-23 21:08:49 UTC (rev 73643)
@@ -1,4 +1,14 @@
<?php
+/**
+ * SessionStash is intended to accomplish a few things:
+ * - enable applications to temporarily stash files without publishing them
to the wiki.
+ * - Several parts of MediaWiki do this in similar ways: UploadBase,
UploadWizard, and FirefoggChunkedExtension
+ * the idea is to unify them all here
+ * - enable applications to find said files later, as long as the session or
temp files haven't been purged.
+ * - enable the uploading user (and *ONLY* the uploading user) to access
said files, and thumbnails of said files, via a URL.
+ * We accomplish this by making the session serve as a URL->file mapping,
on the assumption that nobody else can access
+ * the session, even the uploading user.
+ */
class SessionStash {
// repository that this uses to store temp files
@@ -7,9 +17,12 @@
// array of initialized objects obtained from session (lazily
initialized upon getFile())
private $files = array();
- const SESSION_VERSION = 2;
- const SESSION_KEYNAME = 'wsUploadData';
- const SESSION_THUMB_KEYNAME = 'wsUploadDataThumb';
+ // the base URL for files in the stash
+ private $baseUrl;
+
+ // TODO: Once UploadBase starts using this, switch to use these
constants rather than UploadBase::SESSION*
+ // const SESSION_VERSION = 2;
+ // const SESSION_KEYNAME = 'wsUploadData';
/**
* Represents the session which contain temporarily stored files.
@@ -27,14 +40,15 @@
throw new MWException( 'session not available' );
}
- if ( ! array_key_exists( self::SESSION_KEYNAME, $_SESSION ) ) {
- $_SESSION[self::SESSION_KEYNAME] = array();
+ if ( ! array_key_exists( UploadBase::SESSION_KEYNAME, $_SESSION
) ) {
+ $_SESSION[UploadBase::SESSION_KEYNAME] = array();
}
+
+ $this->baseUrl = SpecialPage::getTitleFor( 'SessionStash'
)->getLocalURL();
}
public function getBaseUrl() {
- // XXX do this better
- return '/wiki/Special:SessionStash';
+ return $this->baseUrl;
}
/**
@@ -45,9 +59,9 @@
*/
public function getFile( $key ) {
if ( !array_key_exists( $key, $this->files ) ) {
- $stashData = $_SESSION[self::SESSION_KEYNAME][$key];
+ $stashData =
$_SESSION[UploadBase::SESSION_KEYNAME][$key];
- if ($stashData['version'] !== self::SESSION_VERSION ) {
+ if ($stashData['version'] !==
UploadBase::SESSION_VERSION ) {
throw new MWException( 'session item schema
does not match current software' );
}
@@ -96,7 +110,7 @@
'mTempPath' => $stashPath,
'mFileSize' => $fileSize,
'mFileProps' => $fileProps,
- 'version' => self::SESSION_VERSION
+ 'version' => UploadBase::SESSION_VERSION
);
// put extended info into the session (this changes from
application to application).
@@ -107,7 +121,7 @@
}
}
- $_SESSION[self::SESSION_KEYNAME][$key] = $stashData;
+ $_SESSION[UploadBase::SESSION_KEYNAME][$key] = $stashData;
wfDebug( "SESSION\n=====\n " . print_r( $_SESSION, 1 ) . "\n" );
@@ -156,6 +170,9 @@
* Find or guess extension -- ensuring that our extension matches our
mime type.
* Since these files are constructed from php tempnames they may not
start off
* with an extension
+ * This does not override getExtension because things like getMimeType
already call getExtension,
+ * and that results in infinite recursion. So, we preemptively *set*
the extension so getExtension can find it.
+ * For obvious reasons this should be called as early as possible, as
part of initialization
*/
public function setExtension() {
// Does this have an extension?
@@ -179,7 +196,7 @@
throw 'cannot determine extension';
}
- return parent::normalizeExtension( $extension );
+ $this->extension = parent::normalizeExtension( $extension );
}
/**
@@ -188,7 +205,7 @@
* buggy code elsewhere that expects a boolean 'suffix'
*
* @param {String|false} name of thumbnail (e.g. "120px-123456.jpg" ),
or false to just get the path
- * @param {String} path thumbnail should take on filesystem, or
containing directory if thumbname is false
+ * @return {String} path thumbnail should take on filesystem, or
containing directory if thumbname is false
*/
public function getThumbPath( $thumbName=false ) {
$path = dirname( $this->path );
@@ -251,6 +268,7 @@
/**
* Return the URL of the file, if for some reason we wanted to download
it
* We tend not to do this for the original file, but we do want thumb
icons
+ * @return {String} url
*/
public function getUrl() {
if ( !isset( $this->url ) ) {
@@ -268,7 +286,7 @@
public function transform( $params, $flags=0 ) {
// force it to get a thumbnail right away
- $flags &= self::RENDER_NOW;
+ $flags |= self::RENDER_NOW;
// returns a ThumbnailImage object containing the url and path.
Note. NOT A FILE OBJECT.
$thumb = parent::transform( $params, $flags );
@@ -282,12 +300,10 @@
}
$stashedThumbFile = $this->sessionStash->stashFile( $key,
$thumb->path );
- $thumb->url = $this->sessionStash->getBaseUrl() . '/' . $key .
"." . $stashedThumbFile->extension;
+ $thumb->url = $stashedThumbFile->getUrl();
return $thumb;
}
}
-
-?>
Modified: branches/uploadwizard/extensions/UploadWizard/UploadWizardMessages.php
===================================================================
--- branches/uploadwizard/extensions/UploadWizard/UploadWizardMessages.php
2010-09-23 21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/extensions/UploadWizard/UploadWizardMessages.php
2010-09-23 21:08:49 UTC (rev 73643)
@@ -49,8 +49,7 @@
$messagesForJs[ $key ] = wfMsgGetKey( $key, /*DB*/true,
$language, /*Transform*/false );
}
- $json = new Services_JSON();
- $messagesJson = $json->encode( $messagesForJs );
+ $messagesJson = FormatJson::encode( $messagesForJs );
return 'mw.addMessages(' . $messagesJson . ');';
}
@@ -69,5 +68,3 @@
}
}
-
-?>
Property changes on:
branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp-wikis.ini.sample
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.ini.sample
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/uploadwizard/extensions/XMLRC/bridge/udp2xmpp.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/uploadwizard/extensions/XMLRC/client/README
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/uploadwizard/extensions/XMLRC/generator
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/uploadwizard/extensions/XMLRC/generator/README
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
branches/uploadwizard/extensions/XMLRC/generator/rc2udp.ini.sample
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/uploadwizard/extensions/XMLRC/generator/rc2udp.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/uploadwizard/phase3
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
+ /branches/REL1_15/phase3:51646
/branches/new-installer/phase3:43664-66004
/branches/sqlite:58211-58321
/trunk/phase3:73549-73568*
Property changes on: branches/uploadwizard/phase3/COPYING
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/COPYING:51646
/branches/new-installer/phase3/COPYING:43664-66004
/branches/sqlite/COPYING:58211-58321
/trunk/phase3/COPYING:73549-73568
Property changes on: branches/uploadwizard/phase3/CREDITS
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/CREDITS:51646
/branches/new-installer/phase3/CREDITS:43664-66004
/branches/sqlite/CREDITS:58211-58321
/trunk/phase3/CREDITS:73549-73568
Property changes on: branches/uploadwizard/phase3/FAQ
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/FAQ:51646
/branches/new-installer/phase3/FAQ:43664-66004
/branches/sqlite/FAQ:58211-58321
/trunk/phase3/FAQ:73549-73568
Property changes on: branches/uploadwizard/phase3/HISTORY
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/HISTORY:51646
/branches/new-installer/phase3/HISTORY:43664-66004
/branches/sqlite/HISTORY:58211-58321
/trunk/phase3/HISTORY:73549-73568
Property changes on: branches/uploadwizard/phase3/INSTALL
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/INSTALL:51646
/branches/new-installer/phase3/INSTALL:43664-66004
/branches/sqlite/INSTALL:58211-58321
/trunk/phase3/INSTALL:73549-73568
Property changes on: branches/uploadwizard/phase3/README
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/README:51646
/branches/new-installer/phase3/README:43664-66004
/branches/sqlite/README:58211-58321
/trunk/phase3/README:73549-73568
Modified: branches/uploadwizard/phase3/RELEASE-NOTES
===================================================================
--- branches/uploadwizard/phase3/RELEASE-NOTES 2010-09-23 21:06:26 UTC (rev
73642)
+++ branches/uploadwizard/phase3/RELEASE-NOTES 2010-09-23 21:08:49 UTC (rev
73643)
@@ -57,11 +57,11 @@
* $wgVectorExtraStyles was removed, and is no longer in use.
* $wgLoadScript was added to specify alternative locations for ResourceLoader
requests.
-* $wgResourceLoaderVersionedClientMaxage,
$wgResourceLoaderVersionedServerMaxage,
- $wgResourceLoaderUnversionedClientMaxage and
- $wgResourceLoaderUnversionedServerMaxage were added to specify maxage and
- smaxage times for responses from ResourceLoader based on whether the
request's
- URL contained a version parameter or not.
+* $wgResourceLoaderMaxage was added to specify maxage and smaxage times for
+ responses from ResourceLoader based on whether the request's URL contained a
+ version parameter or not.
+* $wgResourceLoaderDebug was added to specify the default state of debug mode;
+ this will still be overridden with the debug URL parameter a la
$wgLanguageCode.
=== New features in 1.17 ===
* (bug 10183) Users can now add personal styles and scripts to all skins via
Property changes on: branches/uploadwizard/phase3/RELEASE-NOTES
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/RELEASE-NOTES:51646
/branches/new-installer/phase3/RELEASE-NOTES:43664-66004
/branches/sqlite/RELEASE-NOTES:58211-58321
/trunk/phase3/RELEASE-NOTES:73549-73568
Property changes on: branches/uploadwizard/phase3/StartProfiler.sample
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/StartProfiler.sample:51646
/branches/new-installer/phase3/StartProfiler.sample:43664-66004
/branches/sqlite/StartProfiler.sample:58211-58321
/trunk/phase3/StartProfiler.sample:73549-73568
Property changes on: branches/uploadwizard/phase3/UPGRADE
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/UPGRADE:51646
/branches/new-installer/phase3/UPGRADE:43664-66004
/branches/sqlite/UPGRADE:58211-58321
/trunk/phase3/UPGRADE:73549-73568
Property changes on: branches/uploadwizard/phase3/api.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/api.php:51646
/branches/new-installer/phase3/api.php:43664-66004
/branches/sqlite/api.php:58211-58321
/trunk/phase3/api.php:73549-73568
Property changes on: branches/uploadwizard/phase3/api.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/api.php5:51646
/branches/new-installer/phase3/api.php5:43664-66004
/branches/sqlite/api.php5:58211-58321
/trunk/phase3/api.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/bin
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/bin:51646
/branches/new-installer/phase3/bin:43664-66004
/branches/sqlite/bin:58211-58321
/trunk/phase3/bin:73549-73568
Property changes on: branches/uploadwizard/phase3/cache
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/cache:51646
/branches/new-installer/phase3/cache:43664-66004
/branches/sqlite/cache:58211-58321
/trunk/phase3/cache:73549-73568
Property changes on: branches/uploadwizard/phase3/config
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/config:51646
/branches/new-installer/phase3/config:43664-66004
/branches/sqlite/config:58211-58321
/trunk/phase3/config:73549-73568
Property changes on: branches/uploadwizard/phase3/docs
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/docs:51646
/branches/new-installer/phase3/docs:43664-66004
/branches/sqlite/docs:58211-58321
/trunk/phase3/docs:73549-73568
Property changes on: branches/uploadwizard/phase3/images
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/images:51646
/branches/new-installer/phase3/images:43664-66004
/branches/sqlite/images:58211-58321
/trunk/phase3/images:73549-73568
Property changes on: branches/uploadwizard/phase3/img_auth.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/img_auth.php:51646
/branches/new-installer/phase3/img_auth.php:43664-66004
/branches/sqlite/img_auth.php:58211-58321
/trunk/phase3/img_auth.php:73549-73568
Property changes on: branches/uploadwizard/phase3/img_auth.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/img_auth.php5:51646
/branches/new-installer/phase3/img_auth.php5:43664-66004
/branches/sqlite/img_auth.php5:58211-58321
/trunk/phase3/img_auth.php5:73549-73568
Property changes on: branches/uploadwizard/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
+ /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:73549-73568
Property changes on: branches/uploadwizard/phase3/includes/ChangesList.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/resourceloader/phase3/includes/ChangesList.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
+ /branches/REL1_15/phase3/includes/ChangesList.php:51646
/branches/resourceloader/phase3/includes/ChangesList.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/ChangesList.php:53381,57589
/trunk/phase3/includes/ChangesList.php:73549-73568
Property changes on: branches/uploadwizard/phase3/includes/ConfEditor.php
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/phase3/includes/ConfEditor.php:73549-73568
Modified: branches/uploadwizard/phase3/includes/DefaultSettings.php
===================================================================
--- branches/uploadwizard/phase3/includes/DefaultSettings.php 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/DefaultSettings.php 2010-09-23
21:08:49 UTC (rev 73643)
@@ -1645,32 +1645,28 @@
$wgClockSkewFudge = 5;
/**
- * Maximum time in seconds to cache versioned resources served by the resource
- * loader on the client side (e.g. in the browser cache).
+ * Maximum time in seconds to cache resources served by the resource loader
*/
-$wgResourceLoaderVersionedClientMaxage = 30 * 24 * 60 * 60; // 30 days
+$wgResourceLoaderMaxage = array(
+ 'versioned' => array(
+ // Squid/Varnish but also any other public proxy cache between
the client and MediaWiki
+ 'server' => 30 * 24 * 60 * 60, // 30 days
+ // On the client side (e.g. in the browser cache).
+ 'client' => 30 * 24 * 60 * 60, // 30 days
+ ),
+ 'unversioned' => array(
+ 'server' => 5 * 60, // 5 minutes
+ 'client' => 5 * 60, // 5 minutes
+ ),
+);
/**
- * Maximum time in seconds to cache versioned resources served by the resource
- * loader on the server side. This means Squid/Varnish but also any other
public
- * proxy cache between the client and MediaWiki.
+ * The default debug mode (on/off) for of ResourceLoader requests. This will
still
+ * be overridden when the debug URL parameter is used.
*/
-$wgResourceLoaderVersionedServerMaxage = 30 * 24 * 60 * 60; // 30 days
+$wgResourceLoaderDebug = false;
/**
- * Maximum time in seconds to cache unversioned resources served by the
resource
- * loader on the client.
- */
-$wgResourceLoaderUnversionedClientMaxage = 5 * 60; // 5 minutes
-
-/**
- * Maximum time in seconds to cache unversioned resources served by the
resource
- * loader on the server. This means Squid/Varnish but also any other public
- * proxy cache between the client and MediaWiki.
- */
-$wgResourceLoaderUnversionedServerMaxage = 5 * 60; // 5 minutes
-
-/**
* Enable data URL embedding (experimental). This variable is very temporary
and
* will be removed once we get this feature stable.
*/
Modified: branches/uploadwizard/phase3/includes/EditPage.php
===================================================================
--- branches/uploadwizard/phase3/includes/EditPage.php 2010-09-23 21:06:26 UTC
(rev 73642)
+++ branches/uploadwizard/phase3/includes/EditPage.php 2010-09-23 21:08:49 UTC
(rev 73643)
@@ -2246,7 +2246,7 @@
}
$wgOut->addScript( Html::inlineScript(
- "if ( mediaWiki !== undefined ) { $script }"
+ "if ( window.mediaWiki ) { $script }"
) );
$toolbar .= "\n</div>";
Property changes on: branches/uploadwizard/phase3/includes/GlobalFunctions.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646
/branches/new-installer/phase3/includes/GlobalFunctions.php:43664-66004
/branches/resourceloader/phase3/includes/GlobalFunctions.php:71750
/branches/sqlite/includes/GlobalFunctions.php:58211-58321
/branches/wmf-deployment/includes/GlobalFunctions.php:53381
+ /branches/REL1_15/phase3/includes/GlobalFunctions.php:51646
/branches/new-installer/phase3/includes/GlobalFunctions.php:43664-66004
/branches/resourceloader/phase3/includes/GlobalFunctions.php:71750
/branches/sqlite/includes/GlobalFunctions.php:58211-58321
/branches/wmf-deployment/includes/GlobalFunctions.php:53381
/trunk/phase3/includes/GlobalFunctions.php:73549-73568
Property changes on: branches/uploadwizard/phase3/includes/HistoryPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
+ /branches/REL1_15/phase3/includes/PageHistory.php:51646
/branches/resourceloader/phase3/includes/HistoryPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/trunk/phase3/includes/HistoryPage.php:73549-73568
Property changes on: branches/uploadwizard/phase3/includes/Interwiki.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Interwiki.php:51646
/branches/iwtransclusion/phase3/includes/Interwiki.php:68170,68448,69480,69541
/branches/new-installer/phase3/includes/Interwiki.php:43664-66004
/branches/sqlite/includes/Interwiki.php:58211-58321
/branches/wmf-deployment/includes/Interwiki.php:53381
+ /branches/REL1_15/phase3/includes/Interwiki.php:51646
/branches/iwtransclusion/phase3/includes/Interwiki.php:68170,68448,69480,69541
/branches/new-installer/phase3/includes/Interwiki.php:43664-66004
/branches/sqlite/includes/Interwiki.php:58211-58321
/branches/wmf-deployment/includes/Interwiki.php:53381
/trunk/phase3/includes/Interwiki.php:73549-73568
Modified: branches/uploadwizard/phase3/includes/Message.php
===================================================================
--- branches/uploadwizard/phase3/includes/Message.php 2010-09-23 21:06:26 UTC
(rev 73642)
+++ branches/uploadwizard/phase3/includes/Message.php 2010-09-23 21:08:49 UTC
(rev 73643)
@@ -158,7 +158,9 @@
if( $lang instanceof Language ){
$this->language = $lang;
} elseif ( is_string( $lang ) ) {
- $this->language = Language::factory( $lang );
+ if( $this->language->getCode() != $lang ) {
+ $this->language = Language::factory( $lang );
+ }
} else {
$type = gettype( $lang );
throw new MWException( __METHOD__ . " must be "
Modified: branches/uploadwizard/phase3/includes/OutputPage.php
===================================================================
--- branches/uploadwizard/phase3/includes/OutputPage.php 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/OutputPage.php 2010-09-23
21:08:49 UTC (rev 73643)
@@ -2281,12 +2281,12 @@
}
static function makeResourceLoaderLink( $skin, $modules, $only ) {
- global $wgUser, $wgLang, $wgRequest, $wgLoadScript;
+ global $wgUser, $wgLang, $wgRequest, $wgLoadScript,
$wgResourceLoaderDebug;
// TODO: Should this be a static function of ResourceLoader
instead?
// TODO: Divide off modules starting with "user", and add the
user parameter to them
$query = array(
'lang' => $wgLang->getCode(),
- 'debug' => ( $wgRequest->getBool( 'debug' ) &&
$wgRequest->getVal( 'debug' ) == 'true' ) ? 'true' : 'false',
+ 'debug' => $wgRequest->getFuzzyBool( 'debug',
$wgResourceLoaderDebug ) ? 'true' : 'false',
'skin' => $wgUser->getSkin()->getSkinName(),
'only' => $only,
);
@@ -2346,8 +2346,7 @@
* @return String: HTML fragment
*/
function getHeadScripts( Skin $sk ) {
- global $wgUser, $wgRequest;
- global $wgUseSiteJs;
+ global $wgUser, $wgRequest, $wgUseSiteJs,
$wgResourceLoaderDebug;
// Statup - this will immediately load jquery and mediawiki
modules
$scripts = self::makeResourceLoaderLink( $sk, 'startup',
'scripts' );
@@ -2357,7 +2356,7 @@
$scripts .= Skin::makeGlobalVariablesScript( $sk->getSkinName()
) . "\n";
// Script and Messages "only"
- if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal(
'debug' ) !== 'false' ) {
+ if ( $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug
) ) {
// Scripts
foreach ( $this->getModuleScripts() as $name ) {
$scripts .= self::makeResourceLoaderLink( $sk,
$name, 'scripts' );
@@ -2381,7 +2380,7 @@
if ( $this->getModules() ) {
$modules = FormatJson::encode( $this->getModules() );
$scripts .= Html::inlineScript(
- "if ( mediaWiki !== undefined ) {
mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
+ "if ( window.mediaWiki ) {
mediaWiki.loader.load( {$modules} ); mediaWiki.loader.go(); }"
) . "\n";
}
@@ -2455,7 +2454,7 @@
* @return string HTML tag links to be put in the header.
*/
public function getHeadLinks( $sk ) {
- global $wgFeed, $wgRequest;
+ global $wgFeed, $wgRequest, $wgResourceLoaderDebug;
// Ideally this should happen earlier, somewhere. :P
$this->addDefaultMeta();
@@ -2526,7 +2525,7 @@
}
// Support individual script requests in debug mode
- if ( $wgRequest->getBool( 'debug' ) && $wgRequest->getVal(
'debug' ) !== 'false' ) {
+ if ( $wgRequest->getFuzzyBool( 'debug', $wgResourceLoaderDebug
) ) {
foreach ( $this->getModuleStyles() as $name ) {
$tags[] = self::makeResourceLoaderLink( $sk,
$name, 'styles' );
}
Property changes on: branches/uploadwizard/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
+ /branches/REL1_15/phase3/includes/OutputPage.php:51646
/branches/resourceloader/phase3/includes/OutputPage.php:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/wmf-deployment/includes/OutputPage.php:53381,57468
/trunk/phase3/includes/OutputPage.php:73549-73568
Modified: branches/uploadwizard/phase3/includes/ProtectionForm.php
===================================================================
--- branches/uploadwizard/phase3/includes/ProtectionForm.php 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/ProtectionForm.php 2010-09-23
21:08:49 UTC (rev 73643)
@@ -592,7 +592,7 @@
$encOptions = Xml::encodeJsVar( $options );
$script .= "ProtectionForm.init($encOptions)";
- return Html::inlineScript( "if ( mediaWiki !== undefined ) {
mediaWiki.loader.using( 'mediawiki.legacy.protect', function() { {$script} } );
}" );
+ return Html::inlineScript( "if ( window.mediaWiki ) { $script
}" );
}
/**
Modified: branches/uploadwizard/phase3/includes/ResourceLoader.php
===================================================================
--- branches/uploadwizard/phase3/includes/ResourceLoader.php 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/ResourceLoader.php 2010-09-23
21:08:49 UTC (rev 73643)
@@ -249,8 +249,7 @@
* @param $context ResourceLoaderContext object
*/
public static function respond( ResourceLoaderContext $context ) {
- global $wgResourceLoaderVersionedClientMaxage,
$wgResourceLoaderVersionedServerMaxage;
- global $wgResourceLoaderUnversionedServerMaxage,
$wgResourceLoaderUnversionedClientMaxage;
+ global $wgResourceLoaderMaxage;
wfProfileIn( __METHOD__ );
self::initialize();
@@ -270,14 +269,14 @@
// If a version wasn't specified we need a shorter expiry time
for updates to
// propagate to clients quickly
if ( is_null( $context->getVersion() ) ) {
- $maxage = $wgResourceLoaderUnversionedClientMaxage;
- $smaxage = $wgResourceLoaderUnversionedServerMaxage;
+ $maxage =
$wgResourceLoaderMaxage['unversioned']['client'];
+ $smaxage =
$wgResourceLoaderMaxage['unversioned']['server'];
}
// If a version was specified we can use a longer expiry time
since changing
// version numbers causes cache misses
else {
- $maxage = $wgResourceLoaderVersionedClientMaxage;
- $smaxage = $wgResourceLoaderVersionedServerMaxage;
+ $maxage =
$wgResourceLoaderMaxage['versioned']['client'];
+ $smaxage =
$wgResourceLoaderMaxage['versioned']['server'];
}
// To send Last-Modified and support If-Modified-Since, we need
to detect
Property changes on: branches/uploadwizard/phase3/includes/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
+ /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.php:73549-73568
Modified: branches/uploadwizard/phase3/includes/ResourceLoaderContext.php
===================================================================
--- branches/uploadwizard/phase3/includes/ResourceLoaderContext.php
2010-09-23 21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/ResourceLoaderContext.php
2010-09-23 21:08:49 UTC (rev 73643)
@@ -40,7 +40,7 @@
/* Methods */
public function __construct( WebRequest $request ) {
- global $wgLang, $wgDefaultSkin;
+ global $wgLang, $wgDefaultSkin, $wgResourceLoaderDebug;
$this->request = $request;
// Interperet request
@@ -49,7 +49,7 @@
$this->direction = $request->getVal( 'dir' );
$this->skin = $request->getVal( 'skin' );
$this->user = $request->getVal( 'user' );
- $this->debug = $request->getBool( 'debug' ) &&
$request->getVal( 'debug' ) === 'true';
+ $this->debug = $request->getFuzzyBool( 'debug',
$wgResourceLoaderDebug );
$this->only = $request->getVal( 'only' );
$this->version = $request->getVal( 'version' );
Property changes on: branches/uploadwizard/phase3/includes/Title.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
+ /branches/REL1_15/phase3/includes/Title.php:51646
/branches/iwtransclusion/phase3/includes/Title.php:68448,69480
/branches/new-installer/phase3/includes/Title.php:43664-66004
/branches/sqlite/includes/Title.php:58211-58321
/branches/wmf-deployment/includes/Title.php:53381
/trunk/phase3/includes/Title.php:73549-73568
Modified: branches/uploadwizard/phase3/includes/WebRequest.php
===================================================================
--- branches/uploadwizard/phase3/includes/WebRequest.php 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/WebRequest.php 2010-09-23
21:08:49 UTC (rev 73643)
@@ -347,6 +347,19 @@
public function getBool( $name, $default = false ) {
return $this->getVal( $name, $default ) ? true : false;
}
+
+ /**
+ * Fetch a boolean value from the input or return $default if not set.
+ * Unlike getBool, the string "false" will result in boolean false,
which is
+ * useful when interpreting information sent from JavaScript.
+ *
+ * @param $name String
+ * @param $default Boolean
+ * @return Boolean
+ */
+ public function getFuzzyBool( $name, $default = false ) {
+ return $this->getBool( $name, $default ) && $this->getVal(
$name ) !== 'false';
+ }
/**
* Return true if the named value is set in the input, whatever that
Property changes on: branches/uploadwizard/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
+ /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:73549-73568
Property changes on:
branches/uploadwizard/phase3/includes/installer/DatabaseInstaller.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/installer/InstallerDBType.php:51646
/branches/new-installer/phase3/includes/installer/InstallerDBType.php:43664-66004
/branches/sqlite/includes/installer/InstallerDBType.php:58211-58321
/branches/wmf-deployment/includes/installer/InstallerDBType.php:53381
+ /branches/REL1_15/phase3/includes/installer/InstallerDBType.php:51646
/branches/new-installer/phase3/includes/installer/InstallerDBType.php:43664-66004
/branches/sqlite/includes/installer/InstallerDBType.php:58211-58321
/branches/wmf-deployment/includes/installer/InstallerDBType.php:53381
/trunk/phase3/includes/installer/DatabaseInstaller.php:73549-73568
Property changes on:
branches/uploadwizard/phase3/includes/json/Services_JSON.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
+ /branches/REL1_15/phase3/includes/api/ApiFormatJson_json.php:51646
/branches/wmf-deployment/includes/api/ApiFormatJson_json.php:53381
/trunk/phase3/includes/json/Services_JSON.php:73549-73568
Property changes on: branches/uploadwizard/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
+ /branches/REL1_15/phase3/includes/specials:51646
/branches/sqlite/includes/specials:58211-58321
/branches/wmf-deployment/includes/specials:53381,56967
/trunk/phase3/includes/specials:73549-73568
Modified: branches/uploadwizard/phase3/includes/specials/SpecialUserlogin.php
===================================================================
--- branches/uploadwizard/phase3/includes/specials/SpecialUserlogin.php
2010-09-23 21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/includes/specials/SpecialUserlogin.php
2010-09-23 21:08:49 UTC (rev 73643)
@@ -968,8 +968,6 @@
}
}
- $titleObj = SpecialPage::getTitleFor( 'Userlogin' );
-
if ( $this->mType == 'signup' ) {
global $wgLivePasswordStrengthChecks;
if ( $wgLivePasswordStrengthChecks ) {
Property changes on: branches/uploadwizard/phase3/index.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/index.php:51646
/branches/new-installer/phase3/index.php:43664-66004
/branches/sqlite/index.php:58211-58321
/trunk/phase3/index.php:73549-73568
Property changes on: branches/uploadwizard/phase3/index.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/index.php5:51646
/branches/new-installer/phase3/index.php5:43664-66004
/branches/sqlite/index.php5:58211-58321
/trunk/phase3/index.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/languages
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/languages:51646
/branches/new-installer/phase3/languages:43664-66004
/branches/sqlite/languages:58211-58321
/trunk/phase3/languages:73549-73568
Property changes on: branches/uploadwizard/phase3/load.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/load.php:51646
/branches/new-installer/phase3/load.php:43664-66004
/branches/sqlite/load.php:58211-58321
/trunk/phase3/load.php:73549-73568
Property changes on: branches/uploadwizard/phase3/load.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/load.php5:51646
/branches/new-installer/phase3/load.php5:43664-66004
/branches/sqlite/load.php5:58211-58321
/trunk/phase3/load.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/maintenance:51646
/branches/new-installer/phase3/maintenance:43664-66004
/branches/sqlite/maintenance:58211-58321
/trunk/phase3/maintenance:73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/archives
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/archives:51646
/branches/iwtransclusion/phase3/maintenance/archives:69540
/branches/new-installer/phase3/maintenance/archives:43664-66004
/branches/sqlite/maintenance/archives:58211-58321
+ /branches/REL1_15/phase3/maintenance/archives:51646
/branches/iwtransclusion/phase3/maintenance/archives:69540
/branches/new-installer/phase3/maintenance/archives:43664-66004
/branches/sqlite/maintenance/archives:58211-58321
/trunk/phase3/maintenance/archives:73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/cleanupTable.inc
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
+ /branches/REL1_15/phase3/maintenance/cleanupTable.inc:51646
/branches/wmf-deployment/maintenance/cleanupTable.inc:56715
/trunk/phase3/maintenance/cleanupTable.inc:73549-73568
Property changes on:
branches/uploadwizard/phase3/maintenance/deleteSelfExternals.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626
+ /branches/REL1_15/phase3/maintenance/deleteSelfExternals.php:51646
/trunk/phase3/maintenance/deleteSelfExternals.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,55178,55626,73549-73568
Property changes on:
branches/uploadwizard/phase3/maintenance/populateRevisionLength.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/populateParentId.php:51646
/branches/sqlite/maintenance/populateParentId.php:58211-58321
+ /branches/REL1_15/phase3/maintenance/populateParentId.php:51646
/branches/sqlite/maintenance/populateParentId.php:58211-58321
/trunk/phase3/maintenance/populateRevisionLength.php:73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/tables.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/maintenance/tables.sql:51646
/branches/iwtransclusion/phase3/maintenance/tables.sql:68448,69480
/branches/new-installer/phase3/maintenance/tables.sql:43664-66004
/branches/resourceloader/phase3/maintenance/tables.sql:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/maintenance/tables.sql:58211-58321
+ /branches/REL1_15/phase3/maintenance/tables.sql:51646
/branches/iwtransclusion/phase3/maintenance/tables.sql:68448,69480
/branches/new-installer/phase3/maintenance/tables.sql:43664-66004
/branches/resourceloader/phase3/maintenance/tables.sql:68366-69676,69678-70682,70684-71999,72001-72255,72257-72305,72307-72342
/branches/sqlite/maintenance/tables.sql:58211-58321
/trunk/phase3/maintenance/tables.sql:73549-73568
Property changes on: branches/uploadwizard/phase3/maintenance/tests
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/phpunit-restructure/maintenance/tests:72257-72560
+ /branches/phpunit-restructure/maintenance/tests:72257-72560
/trunk/phase3/maintenance/tests:73549-73568
Property changes on: branches/uploadwizard/phase3/math
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/math:51646
/branches/new-installer/phase3/math:43664-66004
/branches/sqlite/math:58211-58321
/trunk/phase3/math:73549-73568
Property changes on: branches/uploadwizard/phase3/opensearch_desc.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/opensearch_desc.php:51646
/branches/new-installer/phase3/opensearch_desc.php:43664-66004
/branches/sqlite/opensearch_desc.php:58211-58321
/trunk/phase3/opensearch_desc.php:73549-73568
Property changes on: branches/uploadwizard/phase3/opensearch_desc.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/opensearch_desc.php5:51646
/branches/new-installer/phase3/opensearch_desc.php5:43664-66004
/branches/sqlite/opensearch_desc.php5:58211-58321
/trunk/phase3/opensearch_desc.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/php5.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/php5.php5:51646
/branches/new-installer/phase3/php5.php5:43664-66004
/branches/sqlite/php5.php5:58211-58321
/trunk/phase3/php5.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/profileinfo.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/profileinfo.php:51646
/branches/new-installer/phase3/profileinfo.php:43664-66004
/branches/sqlite/profileinfo.php:58211-58321
/trunk/phase3/profileinfo.php:73549-73568
Property changes on: branches/uploadwizard/phase3/redirect.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/redirect.php:51646
/branches/new-installer/phase3/redirect.php:43664-66004
/branches/sqlite/redirect.php:58211-58321
/trunk/phase3/redirect.php:73549-73568
Property changes on: branches/uploadwizard/phase3/redirect.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/redirect.php5:51646
/branches/new-installer/phase3/redirect.php5:43664-66004
/branches/sqlite/redirect.php5:58211-58321
/trunk/phase3/redirect.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/redirect.phtml
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/redirect.phtml:51646
/branches/new-installer/phase3/redirect.phtml:43664-66004
/branches/sqlite/redirect.phtml:58211-58321
/trunk/phase3/redirect.phtml:73549-73568
Property changes on: branches/uploadwizard/phase3/resources
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/resources:51646
/branches/new-installer/phase3/resources:43664-66004
/branches/sqlite/resources:58211-58321
/trunk/phase3/resources:73549-73568
Property changes on: branches/uploadwizard/phase3/serialized
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/serialized:51646
/branches/new-installer/phase3/serialized:43664-66004
/branches/sqlite/serialized:58211-58321
/trunk/phase3/serialized:73549-73568
Property changes on: branches/uploadwizard/phase3/skins
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/skins:51646
/branches/new-installer/phase3/skins:43664-66004
/branches/sqlite/skins:58211-58321
/trunk/phase3/skins:73549-73568
Modified: branches/uploadwizard/phase3/skins/common/ajaxwatch.js
===================================================================
--- branches/uploadwizard/phase3/skins/common/ajaxwatch.js 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/skins/common/ajaxwatch.js 2010-09-23
21:08:49 UTC (rev 73643)
@@ -9,22 +9,20 @@
}
wgAjaxWatch.setLinkText = function( $link, action ) {
- if( action == 'watch' || action == 'unwatch' ) {
+ if ( action == 'watch' || action == 'unwatch' ) {
// save the accesskey from the title
- var keyCommand = $link.attr( 'title' ).match( /\[.*?\]$/ )
- ? $link.attr( 'title' ).match( /\[.*?\]$/ )[0]
- : '';
- $link.attr( 'title', mediaWiki.msg.get( 'tooltip-ca-' + action
+ 'Msg') + ' ' + keyCommand );
+ var keyCommand = $link.attr( 'title' ).match( /\[.*?\]$/ ) ?
$link.attr( 'title' ).match( /\[.*?\]$/ )[0] : '';
+ $link.attr( 'title', mediaWiki.msg.get( 'tooltip-ca-' + action
) + ' ' + keyCommand );
}
- if( $link.data( 'icon' ) ) {
- $link.attr( 'alt', mediaWiki.msg.get( action + 'Msg' ) );
+ if ( $link.data( 'icon' ) ) {
+ $link.attr( 'alt', mediaWiki.msg.get( action ) );
if ( action == 'watching' || action == 'unwatching' ) {
$link.addClass( 'loading' );
} else {
$link.removeClass( 'loading' );
}
} else {
- $link.html( mediaWiki.msg.get( action + 'Msg' ) );
+ $link.html( mediaWiki.msg.get( action ) );
}
};
@@ -112,7 +110,7 @@
if( $link.parents( 'li' ).attr( 'id' ) == 'ca-' +
action ) {
$link.parents( 'li' ).attr( 'id', 'ca-' +
otheraction );
// update the link text with the new message
- $link.text( mediaWiki.msg.get( otheraction +
'Msg' ) );
+ $link.text( mediaWiki.msg.get( otheraction ) );
}
};
return false;
Modified: branches/uploadwizard/phase3/skins/vector/screen.css
===================================================================
--- branches/uploadwizard/phase3/skins/vector/screen.css 2010-09-23
21:06:26 UTC (rev 73642)
+++ branches/uploadwizard/phase3/skins/vector/screen.css 2010-09-23
21:08:49 UTC (rev 73643)
@@ -363,7 +363,10 @@
font-size: 13px;
top: 0.25em;
}
- div#simpleSearch .placeholder {
+ div#simpleSearch input {
+ color: black;
+ }
+ div#simpleSearch input.placeholder {
color: #999999;
}
div#simpleSearch input::-webkit-input-placeholder {
Property changes on: branches/uploadwizard/phase3/thumb.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/thumb.php:51646
/branches/new-installer/phase3/thumb.php:43664-66004
/branches/sqlite/thumb.php:58211-58321
/trunk/phase3/thumb.php:73549-73568
Property changes on: branches/uploadwizard/phase3/thumb.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/thumb.php5:51646
/branches/new-installer/phase3/thumb.php5:43664-66004
/branches/sqlite/thumb.php5:58211-58321
/trunk/phase3/thumb.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/trackback.php
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/trackback.php:51646
/branches/new-installer/phase3/trackback.php:43664-66004
/branches/sqlite/trackback.php:58211-58321
/trunk/phase3/trackback.php:73549-73568
Property changes on: branches/uploadwizard/phase3/trackback.php5
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/trackback.php5:51646
/branches/new-installer/phase3/trackback.php5:43664-66004
/branches/sqlite/trackback.php5:58211-58321
/trunk/phase3/trackback.php5:73549-73568
Property changes on: branches/uploadwizard/phase3/wiki.phtml
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/wiki.phtml:51646
/branches/new-installer/phase3/wiki.phtml:43664-66004
/branches/sqlite/wiki.phtml:58211-58321
/trunk/phase3/wiki.phtml:73549-73568
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
