http://www.mediawiki.org/wiki/Special:Code/MediaWiki/98759
Revision: 98759
Author: reedy
Date: 2011-10-03 13:31:37 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
MFT r92930, r96665, r97650, r97701, r97702, r97733, r97794, r97892
Modified Paths:
--------------
branches/REL1_18/extensions/Cite/SpecialCite.php
branches/REL1_18/extensions/FlaggedRevs/dataclasses/FlaggedRevs.class.php
branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.hooks.php
branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
branches/REL1_18/extensions/UploadWizard/resources/mw.UploadWizard.js
branches/REL1_18/extensions/WikiEditor/WikiEditor.php
branches/REL1_18/extensions/WikimediaMessages/WikimediaMessages.php
Modified: branches/REL1_18/extensions/Cite/SpecialCite.php
===================================================================
--- branches/REL1_18/extensions/Cite/SpecialCite.php 2011-10-03 13:20:29 UTC
(rev 98758)
+++ branches/REL1_18/extensions/Cite/SpecialCite.php 2011-10-03 13:31:37 UTC
(rev 98759)
@@ -59,17 +59,15 @@
* @return bool
*/
function wfSpecialCiteToolbox( &$skin ) {
- global $wgUser;
-
if ( isset( $skin->data['nav_urls']['cite'] ) ) {
echo Html::rawElement(
'li',
array( 'id' => 't-cite' ),
- $skin->skin->link(
+ Linker::link(
SpecialPage::getTitleFor( 'Cite' ),
wfMsg( 'cite_article_link' ),
# Used message keys: 'tooltip-cite-article',
'accesskey-cite-article'
- $wgUser->getSkin()->tooltipAndAccessKeyAttribs(
'cite-article' ),
+ Linker::tooltipAndAccessKeyAttribs(
'cite-article' ),
$skin->data['nav_urls']['cite']['args']
)
);
Modified:
branches/REL1_18/extensions/FlaggedRevs/dataclasses/FlaggedRevs.class.php
===================================================================
--- branches/REL1_18/extensions/FlaggedRevs/dataclasses/FlaggedRevs.class.php
2011-10-03 13:20:29 UTC (rev 98758)
+++ branches/REL1_18/extensions/FlaggedRevs/dataclasses/FlaggedRevs.class.php
2011-10-03 13:31:37 UTC (rev 98759)
@@ -963,10 +963,10 @@
# If this is an image page, store corresponding file info
$fileData = array( 'name' => null, 'timestamp' => null, 'sha1'
=> null );
if ( $title->getNamespace() == NS_FILE ) {
- # We must use ImagePage process cache on upload or get
bitten by slave lag
- $file = $article instanceof ImagePage
- ? $article->getFile()
- : wfFindFile( $title );
+ # We must use WikiFilePage process cache on upload or
get bitten by slave lag
+ $file = ( $article instanceof WikiFilePage || $article
instanceof ImagePage )
+ ? $article->getFile() // uses up-to-date
process cache on new uploads
+ : wfFindFile( $title, array( 'bypassCache' =>
true ) ); // skip cache; bug 31056
if ( is_object( $file ) && $file->exists() ) {
$fileData['name'] = $title->getDBkey();
$fileData['timestamp'] = $file->getTimestamp();
Modified: branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.hooks.php
===================================================================
--- branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.hooks.php
2011-10-03 13:20:29 UTC (rev 98758)
+++ branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.hooks.php
2011-10-03 13:31:37 UTC (rev 98759)
@@ -80,11 +80,10 @@
*
* @return bool Acceptable
*/
- private static function acceptNewUserName( $userName, &$err, $override
= true ) {
- global $wgTitleBlacklist, $wgUser;
- efInitTitleBlacklist();
+ private static function acceptNewUserName( $userName, $permissionsUser,
&$err, $override = true ) {
$title = Title::makeTitleSafe( NS_USER, $userName );
- $blacklisted = $wgTitleBlacklist->userCannot( $title, $wgUser,
'new-account', $override );
+ $blacklisted = TitleBlacklist::singleton()->userCannot( $title,
$permissionsUser,
+ 'new-account', $override );
if( $blacklisted instanceof TitleBlacklistEntry ) {
$message = $blacklisted->getErrorMessage( 'new-account'
);
$err = wfMsgWikiHtml( $message, $blacklisted->getRaw(),
$userName );
@@ -101,13 +100,15 @@
public static function abortNewAccount( $user, &$message ) {
global $wgUser, $wgRequest;
$override = $wgRequest->getCheck( 'wpIgnoreTitleBlacklist' );
- return self::acceptNewUserName( $user->getName(), $message,
$override );
+ return self::acceptNewUserName( $user->getName(), $wgUser,
$message, $override );
}
/** CentralAuthAutoCreate hook */
public static function centralAuthAutoCreate( $user, $userName ) {
$message = ''; # Will be ignored
- return self::acceptNewUserName( $userName, $message );
+ $anon = new User;
+ global $wgUser;
+ return self::acceptNewUserName( $userName, $anon, $message );
}
/** EditFilter hook
@@ -176,9 +177,9 @@
/** UserCreateForm hook based on the one from AntiSpoof extension */
public static function addOverrideCheckbox( &$template ) {
- global $wgRequest;
+ global $wgRequest, $wgUser;
- if ( TitleBlacklist::userCanOverride( 'new-account' ) ) {
+ if ( TitleBlacklist::userCanOverride( $wgUser, 'new-account' )
) {
$template->addInputItem( 'wpIgnoreTitleBlacklist',
$wgRequest->getCheck( 'wpIgnoreTitleBlacklist'
),
'checkbox', 'titleblacklist-override' );
Modified: branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
===================================================================
--- branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
2011-10-03 13:20:29 UTC (rev 98758)
+++ branches/REL1_18/extensions/TitleBlacklist/TitleBlacklist.list.php
2011-10-03 13:31:37 UTC (rev 98759)
@@ -138,7 +138,7 @@
* otherwise FALSE
*/
public function userCannot( $title, $user, $action = 'edit', $override
= true ) {
- if( $override && self::userCanOverride( $action ) )
+ if( $override && self::userCanOverride( $user, $action ) ) {
return false;
else
return $this->isBlacklisted( $title, $action );
@@ -266,10 +266,9 @@
*
* @param $action Action
*/
- public static function userCanOverride( $action ) {
- global $wgUser;
- return $wgUser->isAllowed( 'tboverride' ) ||
- ( $action == 'new-account' && $wgUser->isAllowed(
'tboverride-account' ) );
+ public static function userCanOverride( $user, $action ) {
+ return $user->isAllowed( 'tboverride' ) ||
+ ( $action == 'new-account' && $user->isAllowed(
'tboverride-account' ) );
}
}
Modified: branches/REL1_18/extensions/UploadWizard/resources/mw.UploadWizard.js
===================================================================
--- branches/REL1_18/extensions/UploadWizard/resources/mw.UploadWizard.js
2011-10-03 13:20:29 UTC (rev 98758)
+++ branches/REL1_18/extensions/UploadWizard/resources/mw.UploadWizard.js
2011-10-03 13:31:37 UTC (rev 98759)
@@ -358,11 +358,20 @@
this.imageinfo.metadata.orientation =
meta.tiff.Orientation.value;
}
if ( meta.general ) {
+ var pixelHeightDim = 'height';
+ var pixelWidthDim = 'width';
+ // this must be called after orientation is set
above. If no orientation set, defaults to 0
+ var degrees = this.getOrientationDegrees();
+ // jpegmeta reports pixelHeight & width
+ if ( degrees == 90 || degrees == 270 ) {
+ pixelHeightDim = 'width';
+ pixelWidthDim = 'height';
+ }
if ( meta.general.pixelHeight ) {
- this.imageinfo.height =
meta.general.pixelHeight.value;
+ this.imageinfo[pixelHeightDim] =
meta.general.pixelHeight.value;
}
if ( meta.general.pixelWidth ) {
- this.imageinfo.width =
meta.general.pixelWidth.value;
+ this.imageinfo[pixelWidthDim] =
meta.general.pixelWidth.value;
}
}
}
Modified: branches/REL1_18/extensions/WikiEditor/WikiEditor.php
===================================================================
--- branches/REL1_18/extensions/WikiEditor/WikiEditor.php 2011-10-03
13:20:29 UTC (rev 98758)
+++ branches/REL1_18/extensions/WikiEditor/WikiEditor.php 2011-10-03
13:31:37 UTC (rev 98759)
@@ -506,7 +506,6 @@
'scripts' => 'ext.wikiEditor.toolbar.hideSig.js',
'dependencies' => array(
'ext.wikiEditor',
- 'ext.wikiEditor.toolbar',
)
),
);
Modified: branches/REL1_18/extensions/WikimediaMessages/WikimediaMessages.php
===================================================================
--- branches/REL1_18/extensions/WikimediaMessages/WikimediaMessages.php
2011-10-03 13:20:29 UTC (rev 98758)
+++ branches/REL1_18/extensions/WikimediaMessages/WikimediaMessages.php
2011-10-03 13:31:37 UTC (rev 98759)
@@ -37,7 +37,7 @@
}
function efWikimediaEditPageCopyrightWarning( $title, &$msg ) {
- $msg = 'wikimedia-copyrightwarning';
+ $msg = array( 'wikimedia-copyrightwarning' );
return true;
}
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
