[MediaWiki-CVS] SVN: [56408] trunk/phase3/languages/messages
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56408
Revision: 56408
Author: shinjiman
Date: 2009-09-16 07:10:34 + (Wed, 16 Sep 2009)
Log Message:
---
Localisation updates Cantonese, Chinese and Literary Chinese
Modified Paths:
--
trunk/phase3/languages/messages/MessagesLzh.php
trunk/phase3/languages/messages/MessagesYue.php
trunk/phase3/languages/messages/MessagesZh_hans.php
trunk/phase3/languages/messages/MessagesZh_hant.php
Modified: trunk/phase3/languages/messages/MessagesLzh.php
===
--- trunk/phase3/languages/messages/MessagesLzh.php 2009-09-16 05:29:44 UTC
(rev 56407)
+++ trunk/phase3/languages/messages/MessagesLzh.php 2009-09-16 07:10:34 UTC
(rev 56408)
@@ -598,7 +598,8 @@
span
class=plainlinks[{{fullurl:{{#Special:Log}}|page={{urlencode:{{FULLPAGENAME}}
尋誌]，
或[{{fullurl:{{FULLPAGENAME}}|action=edit}} 纂頁]/span。',
'noarticletext-nopermission' =
'查無此文。[[Special:Search/{{PAGENAME}}|尋題]]，或span
class=plainlinks[{{fullurl:{{#Special:Log}}|page={{urlencode:{{FULLPAGENAME}}
尋誌]/span。',
-'userpage-userdoesnotexist'= '$1之簿未增也。請建纂本頁前查之。',
+'userpage-userdoesnotexist'= '「$1」之簿未增也。請建纂本頁前查之。',
+'userpage-userdoesnotexist-view' = '「$1」之簿未增也。',
'clearyourcache' = '''註：'''重取頁面，文方新焉。
'''Mozilla / Firefox /
Safari:'''押''Shift''並點''重新載入''，或合鍵''Ctrl-F5''或''Ctrl-R''（Macintosh為''Command-R''）。
'''Konqueror:'''點''Reload''，或押''F5''。
@@ -755,7 +756,7 @@
'revdelete-legend'= '見，規之以',
'revdelete-hide-text' = '藏審文',
'revdelete-hide-comment' = '藏贊',
-'revdelete-hide-user' = '簿、IP以藏',
+'revdelete-hide-user' = '簿、IP址以藏',
'revdelete-hide-restricted' = '廢有秩與簿之事',
'revdelete-suppress' = '廢有秩與簿之事',
'revdelete-hide-image'= '藏檔',
@@ -795,6 +796,7 @@
'revdelete-otherreason' = '它附因：',
'revdelete-reasonotherlist' = '它因',
'revdelete-edit-reasonlist' = '纂刪因',
+'revdelete-offender' = '審著：',
# Suppression log
'suppressionlog' = '誌廢',
Modified: trunk/phase3/languages/messages/MessagesYue.php
===
--- trunk/phase3/languages/messages/MessagesYue.php 2009-09-16 05:29:44 UTC
(rev 56407)
+++ trunk/phase3/languages/messages/MessagesYue.php 2009-09-16 07:10:34 UTC
(rev 56408)
@@ -716,6 +716,7 @@
'noarticletext-nopermission' =
'喺呢一頁而家並冇任何嘅文字，你可以喺其它嘅頁面中[[Special:Search/{{PAGENAME}}|搵呢一頁嘅標題]]，
或者span
class=plainlinks[{{fullurl:{{#Special:Log}}|page={{urlencode:{{FULLPAGENAME}}
搵有關嘅日誌]/span。',
'userpage-userdoesnotexist'= '用戶戶口$1重未開。請響䦒／編輯呢版之前先檢查一下。',
+'userpage-userdoesnotexist-view' = '用戶戶口$1重未開。',
'clearyourcache' = '''注意 - 喺儲存之後，你可能要先略過你嘅瀏覽器快取去睇到更改。'''
'''Mozilla / Firefox / Safari:'''
㩒住''Shift''掣再撳''重新載入''，又或者㩒''Ctrl-F5''或者''Ctrl-R''（喺Macintosh㩒''Command-R''掣）；
'''Konqueror:''' 就咁以撳個''重載''掣，又或者㩒''F5''；
@@ -908,7 +909,7 @@
'revdelete-hide-text' = '隱藏修訂嘅文字',
'revdelete-hide-name' = '隱藏動作同目標',
'revdelete-hide-comment' = '隱藏編輯註解',
-'revdelete-hide-user' = '隱藏編輯者嘅用戶名／IP',
+'revdelete-hide-user' = '隱藏編輯者嘅用戶名／IP地址',
'revdelete-hide-restricted' = '同時壓制由操作員以及其他用戶的資料',
'revdelete-suppress' = '同時壓制由操作員以及其他用戶的資料',
'revdelete-hide-image'= '隱藏資料內容',
@@ -948,6 +949,7 @@
'revdelete-otherreason' = '其它／附加的原因：',
'revdelete-reasonotherlist' = '其它原因',
'revdelete-edit-reasonlist' = '編輯刪除原因',
+'revdelete-offender' = '修訂著者：',
# Suppression log
'suppressionlog' = '廢止日誌',
Modified: trunk/phase3/languages/messages/MessagesZh_hans.php
===
--- trunk/phase3/languages/messages/MessagesZh_hans.php 2009-09-16 05:29:44 UTC
(rev 56407)
+++ trunk/phase3/languages/messages/MessagesZh_hans.php 2009-09-16 07:10:34 UTC
(rev 56408)
@@ -757,6 +757,7 @@
'noarticletext-nopermission' =
'此页目前没有内容，您可以在其它页[[Special:Search/{{PAGENAME}}|搜索此页标题]]，
或span
class=plainlinks[{{fullurl:{{#Special:Log}}|page={{urlencode:{{FULLPAGENAME}}
搜索有关日志]/span。',
'userpage-userdoesnotexist'= '用户账户“$1”未曾创建。请在创建／编辑这个页面前先检查一下。',
+'userpage-userdoesnotexist-view' = '用户账户“$1”未曾创建。',
'clearyourcache' = '''注意 - 在保存以后，您必须清除浏览器的缓存才能看到所作出的改变。'''
'''Mozilla / Firefox /
Safari'''：按住''Shift''再点击''刷新''，或按下''Ctrl-F5''或''Ctrl-R''（在Macintosh上按下''Command-R''）；
'''Konqueror'''：只需点击''刷新''或按下''F5''；
@@ -945,7 +946,7 @@
'revdelete-hide-text' = '隐藏修订文本',
'revdelete-hide-name' = '隐藏动作和目标',
'revdelete-hide-comment' = '隐藏编辑说明',
-'revdelete-hide-user' = '隐藏编辑者的用户名/IP',
+'revdelete-hide-user' = '隐藏编辑者的用户名/IP地址',
'revdelete-hide-restricted' = '同时阻止管理员与其他用户查看数据',
'revdelete-suppress' = '同时阻止管理员与其他用户查看数据',
'revdelete-hide-image'= '隐藏文件内容',
@@ -985,6 +986,7 @@
[MediaWiki-CVS] SVN: [56409] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56409
Revision: 56409
Author: daniel
Date: 2009-09-16 12:37:43 + (Wed, 16 Sep 2009)
Log Message:
---
IPAuth: authenticate by fixed ip address
Added Paths:
---
trunk/extensions/IPAuth/
trunk/extensions/IPAuth/IPAuth.php
Added: trunk/extensions/IPAuth/IPAuth.php
===
--- trunk/extensions/IPAuth/IPAuth.php (rev 0)
+++ trunk/extensions/IPAuth/IPAuth.php 2009-09-16 12:37:43 UTC (rev 56409)
@@ -0,0 +1,56 @@
+?php
+
+if( !defined( 'MEDIAWIKI' ) ) {
+ echo( IPAuth.\n );
+ die( 1 );
+}
+
+$wgExtensionCredits['other'][] = array(
+ 'path' = __FILE__,
+ 'name' = 'IPAuth',
+ 'author' = 'Daniel Kinzler',
+ 'url' = 'http://mediawiki.org/wiki/Extension:IPAuth',
+ 'description' = 'Automatic login from fixed IPs',
+);
+
+$wgIPAuthUsers = array( );
+# $wgIPAuthUsers = array( 127.0.0.1 = LocalUser );
+
+$wgHooks['UserLoadAfterLoadFromSession'][] =
'ipAuthUserLoadAfterLoadFromSession';
+
+function ipAuthUserLoadAfterLoadFromSession( $user ) {
+ global $wgIPAuthUsers;
+
+ if ( $user-isLoggedIn() ) {
+ return true;
+ }
+
+ $ip = wfGetIP();
+ if ( isset( $wgIPAuthUsers[ $ip ] ) ) {
+ $name = $wgIPAuthUsers[ $ip ];
+
+ $xuser = User::newFromName( $name );
+
+ if($xuser-getID() == 0) {
+ wfDebug( User $name assigned to IP $ip does not
exist!\n );
+ } else {
+ #HACK: force user data reload by assigning members
directly
+ $user-mId = $xuser-mId;
+ $user-mName = $xuser-mName;
+ $user-loadFromId();
+
+ wfDebug( User $name assigned to IP $ip logged in.\n );
+
+ if ( !isset( $_SESSION['wsUserID'] ) ) {
+ wfDebug( Setting up a session for $name
assigned to IP $ip logged in.\n );
+ wfSetupSession();
+ $_SESSION['wsToken'] = IP:$ip;
+ $_SESSION['wsUserName'] = $name;
+ $user-setCookies();
+ }
+ }
+ }
+
+ return true;
+}
+
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56410] trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56410 Revision: 56410 Author: werdna Date: 2009-09-16 12:50:43 + (Wed, 16 Sep 2009) Log Message: --- Remove redundant word in Quote this Modified Paths: -- trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php Modified: trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php === --- trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php2009-09-16 12:37:43 UTC (rev 56409) +++ trunk/extensions/LiquidThreads/i18n/Lqt.i18n.php2009-09-16 12:50:43 UTC (rev 56410) @@ -235,7 +235,7 @@ // Quoting functionality 'lqt-quote-intro' = 'On $2 at $3, [[User:$1]] wrote:', - 'lqt-quote' = 'Quote this', + 'lqt-quote' = 'Quote', // Search 'lqt-search-legend' = 'Search discussions on this page', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56411] trunk/extensions/IPAuth/IPAuth.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56411
Revision: 56411
Author: daniel
Date: 2009-09-16 12:50:55 + (Wed, 16 Sep 2009)
Log Message:
---
license statement for IPAuth
Modified Paths:
--
trunk/extensions/IPAuth/IPAuth.php
Modified: trunk/extensions/IPAuth/IPAuth.php
===
--- trunk/extensions/IPAuth/IPAuth.php 2009-09-16 12:50:43 UTC (rev 56410)
+++ trunk/extensions/IPAuth/IPAuth.php 2009-09-16 12:50:55 UTC (rev 56411)
@@ -1,5 +1,37 @@
?php
+/*
+ Copyright (c) 2009, Wikimedia Deutschland (Daniel Kinzler)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+ * Neither the name of Wikimedia Deutschland nor the
+names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY WIKIMEDIA DEUTSCHLAND ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL WIKIMEDIA DEUTSCHLAND BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ NOTE: This software is not released as a product. It was written primarily for
+ Wikimedia Deutschland's own use, and is made public as is, in the hope it may
+ be useful. Wikimedia Deutschland may at any time discontinue developing or
+ supporting this software. There is no guarantee any new versions or even fixes
+ for security issues will be released.
+*/
+
if( !defined( 'MEDIAWIKI' ) ) {
echo( IPAuth.\n );
die( 1 );
@@ -8,7 +40,7 @@
$wgExtensionCredits['other'][] = array(
'path' = __FILE__,
'name' = 'IPAuth',
- 'author' = 'Daniel Kinzler',
+ 'author' = 'Daniel Kinzler for Wikimedia Deutschland',
'url' = 'http://mediawiki.org/wiki/Extension:IPAuth',
'description' = 'Automatic login from fixed IPs',
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56412] trunk/phase3/includes/LogPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56412 Revision: 56412 Author: aaron Date: 2009-09-16 13:28:01 + (Wed, 16 Sep 2009) Log Message: --- Set log_page on save Modified Paths: -- trunk/phase3/includes/LogPage.php Modified: trunk/phase3/includes/LogPage.php === --- trunk/phase3/includes/LogPage.php 2009-09-16 12:50:55 UTC (rev 56411) +++ trunk/phase3/includes/LogPage.php 2009-09-16 13:28:01 UTC (rev 56412) @@ -72,6 +72,7 @@ 'log_user_text' = $this-doer-getName(), 'log_namespace' = $this-target-getNamespace(), 'log_title' = $this-target-getDBkey(), + 'log_page' = $this-target-getArticleId(), 'log_comment' = $this-comment, 'log_params' = $this-params ); ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56413] trunk/extensions/PdfHandler
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56413
Revision: 56413
Author: thomasv
Date: 2009-09-16 13:50:09 + (Wed, 16 Sep 2009)
Log Message:
---
extract text layer from pdf
Modified Paths:
--
trunk/extensions/PdfHandler/PdfHandler.image.php
trunk/extensions/PdfHandler/PdfHandler.php
trunk/extensions/PdfHandler/PdfHandler_body.php
Modified: trunk/extensions/PdfHandler/PdfHandler.image.php
===
--- trunk/extensions/PdfHandler/PdfHandler.image.php2009-09-16 13:28:01 UTC
(rev 56412)
+++ trunk/extensions/PdfHandler/PdfHandler.image.php2009-09-16 13:50:09 UTC
(rev 56413)
@@ -79,7 +79,7 @@
}
public function retrieveMetaData() {
- global $wgPdfInfo;
+ global $wgPdfInfo, $wgPdftoText;
if ( $wgPdfInfo ) {
wfProfileIn( 'pdfinfo' );
@@ -93,6 +93,25 @@
} else {
$data = null;
}
+
+ # Read text layer
+ if ( isset( $wgPdftoText ) ) {
+ wfProfileIn( 'pdftotext' );
+ $cmd = wfEscapeShellArg( $wgPdftoText ) . ' '.
wfEscapeShellArg( $this-mFilename ) . ' - ';
+ wfDebug( __METHOD__.: $cmd\n );
+ $txt = wfShellExec( $cmd, $retval );
+ wfProfileOut( 'pdftotext' );
+ if( $retval == 0) {
+ # Get rid of invalid UTF-8, strip control
characters
+ wfSuppressWarnings();
+ $txt = iconv( UTF-8,UTF-8//IGNORE, $txt );
+ wfRestoreWarnings();
+ $txt = preg_replace( /[\013\035\037]/, ,
$txt );
+ $txt = htmlspecialchars($txt);
+ $pages = preg_split(/\f/s, $txt );
+ $data['text'] = $pages;
+ }
+ }
return $data;
}
Modified: trunk/extensions/PdfHandler/PdfHandler.php
===
--- trunk/extensions/PdfHandler/PdfHandler.php 2009-09-16 13:28:01 UTC (rev
56412)
+++ trunk/extensions/PdfHandler/PdfHandler.php 2009-09-16 13:50:09 UTC (rev
56413)
@@ -39,6 +39,7 @@
$wgPdfProcessor = 'gs';
$wgPdfPostProcessor = 'convert';
$wgPdfInfo = 'pdfinfo';
+$wgPdftoText= 'pdftotext';
$wgPdfOutputExtension = jpg;
$wgPdfHandlerDpi = 150;
Modified: trunk/extensions/PdfHandler/PdfHandler_body.php
===
--- trunk/extensions/PdfHandler/PdfHandler_body.php 2009-09-16 13:28:01 UTC
(rev 56412)
+++ trunk/extensions/PdfHandler/PdfHandler_body.php 2009-09-16 13:50:09 UTC
(rev 56413)
@@ -202,4 +202,19 @@
$data = $this-getMetaArray( $image );
return PdfImage::getPageSize( $data, $page );
}
+
+ function getPageText( $image, $page ){
+ $data = $this-getMetaArray( $image, true );
+ if ( !$data ) {
+ return false;
+ }
+ if( ! isset( $data['text'] ) ) {
+ return false;
+ }
+ if( ! isset( $data['text'][$page-1] ) ) {
+ return false;
+ }
+ return $data['text'][$page-1];
+ }
+
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56414] trunk/extensions/ProofreadPage/ProofreadPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56414
Revision: 56414
Author: thomasv
Date: 2009-09-16 13:51:10 + (Wed, 16 Sep 2009)
Log Message:
---
read text layer from pdf
Modified Paths:
--
trunk/extensions/ProofreadPage/ProofreadPage.php
Modified: trunk/extensions/ProofreadPage/ProofreadPage.php
===
--- trunk/extensions/ProofreadPage/ProofreadPage.php2009-09-16 13:50:09 UTC
(rev 56413)
+++ trunk/extensions/ProofreadPage/ProofreadPage.php2009-09-16 13:51:10 UTC
(rev 56414)
@@ -1092,12 +1092,15 @@
}
$image = wfFindFile( $imageTitle );
- if ( $image $image-exists() $image-getMimeType() ==
'image/vnd.djvu' ) {
- $text = $image-handler-getPageText($image, $m[2]);
- if ( $text ) {
- $text = preg_replace( /(n)/, \n, $text
);
- $text = preg_replace( /(\d*)/, , $text
);
- $textbox1 = $text;
+ if ( $image $image-exists() ) {
+ $mime = $image-getMimeType();
+ if( $mime == 'image/vnd.djvu' || $mime ==
'application/pdf') {
+ $text = $image-handler-getPageText($image,
$m[2]);
+ if ( $text ) {
+ $text = preg_replace( /(n)/,
\n, $text );
+ $text = preg_replace( /(\d*)/,
, $text );
+ $textbox1 = $text;
+ }
}
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56415] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56415
Revision: 56415
Author: daniel
Date: 2009-09-16 14:15:07 + (Wed, 16 Sep 2009)
Log Message:
---
Lockout extension: prevent blocked users from logging in.
Added Paths:
---
trunk/extensions/Lockout/
trunk/extensions/Lockout/Lockout.php
Removed Paths:
-
trunk/extensions/Lockout/IPAuth.php
Property changes on: trunk/extensions/Lockout
___
Added: svn:mergeinfo
+
Deleted: trunk/extensions/Lockout/IPAuth.php
===
--- trunk/extensions/IPAuth/IPAuth.php 2009-09-16 12:37:43 UTC (rev 56409)
+++ trunk/extensions/Lockout/IPAuth.php 2009-09-16 14:15:07 UTC (rev 56415)
@@ -1,56 +0,0 @@
-?php
-
-if( !defined( 'MEDIAWIKI' ) ) {
- echo( IPAuth.\n );
- die( 1 );
-}
-
-$wgExtensionCredits['other'][] = array(
- 'path' = __FILE__,
- 'name' = 'IPAuth',
- 'author' = 'Daniel Kinzler',
- 'url' = 'http://mediawiki.org/wiki/Extension:IPAuth',
- 'description' = 'Automatic login from fixed IPs',
-);
-
-$wgIPAuthUsers = array( );
-# $wgIPAuthUsers = array( 127.0.0.1 = LocalUser );
-
-$wgHooks['UserLoadAfterLoadFromSession'][] =
'ipAuthUserLoadAfterLoadFromSession';
-
-function ipAuthUserLoadAfterLoadFromSession( $user ) {
- global $wgIPAuthUsers;
-
- if ( $user-isLoggedIn() ) {
- return true;
- }
-
- $ip = wfGetIP();
- if ( isset( $wgIPAuthUsers[ $ip ] ) ) {
- $name = $wgIPAuthUsers[ $ip ];
-
- $xuser = User::newFromName( $name );
-
- if($xuser-getID() == 0) {
- wfDebug( User $name assigned to IP $ip does not
exist!\n );
- } else {
- #HACK: force user data reload by assigning members
directly
- $user-mId = $xuser-mId;
- $user-mName = $xuser-mName;
- $user-loadFromId();
-
- wfDebug( User $name assigned to IP $ip logged in.\n );
-
- if ( !isset( $_SESSION['wsUserID'] ) ) {
- wfDebug( Setting up a session for $name
assigned to IP $ip logged in.\n );
- wfSetupSession();
- $_SESSION['wsToken'] = IP:$ip;
- $_SESSION['wsUserName'] = $name;
- $user-setCookies();
- }
- }
- }
-
- return true;
-}
-
Added: trunk/extensions/Lockout/Lockout.php
===
--- trunk/extensions/Lockout/Lockout.php(rev 0)
+++ trunk/extensions/Lockout/Lockout.php2009-09-16 14:15:07 UTC (rev
56415)
@@ -0,0 +1,69 @@
+?php
+/*
+ Copyright (c) 2009, Wikimedia Deutschland (Daniel Kinzler)
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+ * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+ * Neither the name of Wikimedia Deutschland nor the
+names of its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY WIKIMEDIA DEUTSCHLAND ''AS IS'' AND ANY
+ EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL WIKIMEDIA DEUTSCHLAND BE LIABLE FOR ANY
+ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ NOTE: This software is not released as a product. It was written primarily for
+ Wikimedia Deutschland's own use, and is made public as is, in the hope it may
+ be useful. Wikimedia Deutschland may at any time discontinue developing or
+ supporting this software. There is no guarantee any new versions or even fixes
+ for security issues will be released.
+*/
+
+if( !defined( 'MEDIAWIKI' ) ) {
+ echo( Lockout.\n );
+ die( 1 );
+}
+
[MediaWiki-CVS] SVN: [56416] trunk/phase3/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56416
Revision: 56416
Author: btongminh
Date: 2009-09-16 15:09:00 + (Wed, 16 Sep 2009)
Log Message:
---
Cleanup SpecialUpload::getExistsWarning which referenced some undeclared
variables.
There is some more cleanup to be done in SpecialUpload::getExistsWarning and
UploadBase::getExistsWarning, but there are currently no errors as far as I'm
aware. I will probably break b/c on them though.
Modified Paths:
--
trunk/phase3/includes/specials/SpecialUpload.php
trunk/phase3/includes/upload/UploadBase.php
Modified: trunk/phase3/includes/specials/SpecialUpload.php
===
--- trunk/phase3/includes/specials/SpecialUpload.php2009-09-16 14:15:07 UTC
(rev 56415)
+++ trunk/phase3/includes/specials/SpecialUpload.php2009-09-16 15:09:00 UTC
(rev 56416)
@@ -320,16 +320,17 @@
}
/**
-* Do existence checks on a file and produce a warning
+* Formats a result of UploadBase::getExistsWarning as HTML
* This check is static and can be done pre-upload via AJAX
-* Returns an HTML fragment consisting of one or more LI elements if
there is a warning
-* Returns an empty string if there is no warning
+*
+* @param array $exists The result of UploadBase::getExistsWarning
+* @return string Empty string if there is no warning or an HTML
fragment
+* consisting of one or more li elements if there is a warning.
*/
- static function getExistsWarning( $exists ) {
+ public static function getExistsWarning( $exists ) {
global $wgUser, $wgContLang;
- // Check for uppercase extension. We allow these filenames but
check if an image
- // with lowercase extension exists already
- if( $exists === false )
+
+ if ( !$exists )
return '';
$warning = '';
@@ -337,7 +338,8 @@
list( $existsType, $file ) = $exists;
- if( strpos( $file-getName(), '.' ) == false ) {
+ if ( strpos( $file-getName(), '.' ) == false ) {
+ // File does not have an extension or starts with a dot
$partname = $file-getName();
$rawExtension = '';
} else {
@@ -365,18 +367,20 @@
$warning .= 'li' . wfMsgExt( 'fileexists',
array('parseinline','replaceafter'), $dlink ) . '/li' . $dlink2;
} elseif( $existsType == 'page-exists' ) {
+ // Page exists but file does not
$lnk = $sk-linkKnown( $file-getTitle(), '',
'',array('redirect'='no') );
$warning .= 'li' . wfMsgExt( 'filepageexists', array(
'parseinline', 'replaceafter' ), $lnk ) . '/li';
} elseif ( $existsType == 'exists-normalized' ) {
# Check if image with lowercase extension exists.
# It's not forbidden but in 99% it makes no sense to
upload the same filename with uppercase extension
- $dlink = $sk-linkKnown( $nt_lc );
- if ( $file_lc-allowInlineDisplay() ) {
+ $normalizedTitle = $file-getTitle();
+ $dlink = $sk-linkKnown( $normalizedTitle );
+ if ( $file-allowInlineDisplay() ) {
// FIXME: replace deprecated makeImageLinkObj
by link()
- $dlink2 = $sk-makeImageLinkObj( $nt_lc,
wfMsgExt( 'fileexists-thumb', 'parseinline' ),
- $nt_lc-getText(), $align, array(),
false, true );
- } elseif ( !$file_lc-allowInlineDisplay()
$file_lc-isSafeFile() ) {
- $icon = $file_lc-iconThumb();
+ $dlink2 = $sk-makeImageLinkObj(
$normalizedTitle, wfMsgExt( 'fileexists-thumb', 'parseinline' ),
+ $normalizedTitle-getText(), $align,
array(), false, true );
+ } elseif ( !$file-allowInlineDisplay()
$file-isSafeFile() ) {
+ $icon = $file-iconThumb();
$dlink2 = 'div style=float:' . $align . '
id=mw-media-icon' .
$icon-toHtml( array( 'desc-link' =
true ) ) . 'br /' . $dlink . '/div';
} else {
@@ -388,41 +392,34 @@
$file-getTitle()-getPrefixedText(),
$dlink ) .
'/li' . $dlink2;
- } elseif ( ( substr( $partname , 3, 3 ) == 'px-' || substr(
$partname , 2, 3 ) == 'px-' )
-preg_match( /[0-9]{2}/ , substr( $partname , 0, 2
) ) )
- {
-
[MediaWiki-CVS] SVN: [56418] trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56418
Revision: 56418
Author: aaron
Date: 2009-09-16 16:22:42 + (Wed, 16 Sep 2009)
Log Message:
---
doc fixes
Modified Paths:
--
trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
Modified: trunk/extensions/ReaderFeedback/ReaderFeedback.class.php
===
--- trunk/extensions/ReaderFeedback/ReaderFeedback.class.php2009-09-16
15:33:38 UTC (rev 56417)
+++ trunk/extensions/ReaderFeedback/ReaderFeedback.class.php2009-09-16
16:22:42 UTC (rev 56418)
@@ -34,7 +34,7 @@
}
/**
-* Get the the weight of a feedback tag
+* Get the weight of a feedback tag
* @param string $tag
* @returns array
*/
@@ -42,7 +42,11 @@
self::load();
return self::$feedbackTagWeight[$tag];
}
-
+
+ /**
+* Get the number of reviews that is considered a good sample
+* @returns int
+*/
public static function getFeedbackSize() {
global $wgFeedbackSizeThreshhold;
return (int)$wgFeedbackSizeThreshhold;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56419] branches/wmf-deployment-work/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56419 Revision: 56419 Author: brion Date: 2009-09-16 17:06:27 + (Wed, 16 Sep 2009) Log Message: --- Merge r56356 from trunk -- workaround to let us deal with the index setup funk for changetags Modified Paths: -- branches/wmf-deployment-work/includes/ChangeTags.php branches/wmf-deployment-work/includes/DefaultSettings.php Modified: branches/wmf-deployment-work/includes/ChangeTags.php === --- branches/wmf-deployment-work/includes/ChangeTags.php2009-09-16 16:22:42 UTC (rev 56418) +++ branches/wmf-deployment-work/includes/ChangeTags.php2009-09-16 17:06:27 UTC (rev 56419) @@ -125,7 +125,9 @@ // Add an INNER JOIN on change_tag // FORCE INDEX -- change_tags will almost ALWAYS be the correct query plan. - $options['USE INDEX'] = array( 'change_tag' = 'change_tag_tag_id' ); + global $wgOldChangeTagsIndex; + $index = $wgOldChangeTagsIndex ? 'ct_tag' : 'change_tag_tag_id'; + $options['USE INDEX'] = array( 'change_tag' = $index ); unset( $options['FORCE INDEX'] ); $tables[] = 'change_tag'; $join_conds['change_tag'] = array( 'INNER JOIN', ct_$join_cond=$join_cond ); Modified: branches/wmf-deployment-work/includes/DefaultSettings.php === --- branches/wmf-deployment-work/includes/DefaultSettings.php 2009-09-16 16:22:42 UTC (rev 56418) +++ branches/wmf-deployment-work/includes/DefaultSettings.php 2009-09-16 17:06:27 UTC (rev 56419) @@ -4235,3 +4235,8 @@ // to disable image delete/restore temporarily $wgUploadMaintenance = false; + +/** + * Use old names for change_tags indices. + */ +$wgOldChangeTagsIndex = false; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56420] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56420
Revision: 56420
Author: churchofemacs
Date: 2009-09-16 17:17:16 + (Wed, 16 Sep 2009)
Log Message:
---
Follow-up on r56284: LogEventsList::showLogExtract gets associative array for
additional parameters. Adjusted all calls that use additional parameters. Also
improved Special:Blockip, which now uses those new parameters instead of using
own functions. Fixed HistoryPage which was broken with r56251.
Modified Paths:
--
trunk/phase3/includes/Article.php
trunk/phase3/includes/EditPage.php
trunk/phase3/includes/HistoryPage.php
trunk/phase3/includes/LogEventsList.php
trunk/phase3/includes/specials/SpecialBlockip.php
trunk/phase3/includes/specials/SpecialContributions.php
trunk/phase3/includes/specials/SpecialMovepage.php
trunk/phase3/includes/specials/SpecialRevisiondelete.php
trunk/phase3/languages/messages/MessagesEn.php
trunk/phase3/maintenance/language/messages.inc
Modified: trunk/phase3/includes/Article.php
===
--- trunk/phase3/includes/Article.php 2009-09-16 17:06:27 UTC (rev 56419)
+++ trunk/phase3/includes/Article.php 2009-09-16 17:17:16 UTC (rev 56420)
@@ -1209,19 +1209,14 @@
$wgOut-wrapWikiMsg( 'div
class=mw-userpage-userdoesnotexist error$1/div',
array(
'userpage-userdoesnotexist-view', $this-mTitle-getBaseText() ) );
}
-
}
wfRunHooks( 'ShowMissingArticle', array( $this ) );
# Show delete and move logs
- LogEventsList::showLogExtract(
- $wgOut,
- array( 'delete', 'move' ),
- $this-mTitle-getPrefixedText(),
- '',
- 10,
- array( log_action != 'revision' ),
- false,
- array( 'moveddeleted-notice' )
+ LogEventsList::showLogExtract( $wgOut, array( 'delete', 'move'
), $this-mTitle-getPrefixedText(), '',
+ array( 'lim' = 10,
+ 'conds' = array( log_action != 'revision' ),
+ 'showIfEmpty' = false,
+ 'msgKey' = array( 'moveddeleted-notice' ) )
);
# Show error message
Modified: trunk/phase3/includes/EditPage.php
===
--- trunk/phase3/includes/EditPage.php 2009-09-16 17:06:27 UTC (rev 56419)
+++ trunk/phase3/includes/EditPage.php 2009-09-16 17:17:16 UTC (rev 56420)
@@ -730,8 +730,12 @@
}
# Give a notice if the user is editing a deleted/moved page...
if ( !$this-mTitle-exists() ) {
- LogEventsList::showLogExtract( $wgOut, array( 'delete',
'move' ),
- $this-mTitle-getPrefixedText(), '', 10,
array( log_action != 'revision' ), false, 'recreate-moveddeleted-warn');
+ LogEventsList::showLogExtract( $wgOut, array( 'delete',
'move' ), $this-mTitle-getPrefixedText(),
+ '', array( 'lim' = 10,
+ 'conds' = array( log_action !=
'revision' ),
+ 'showIfEmpty' = false,
+ 'msgKey' = array(
'recreate-moveddeleted-warn') )
+ );
}
}
@@ -1278,10 +1282,8 @@
$noticeMsg = 'protectedpagewarning';
$classes[] = 'mw-textarea-protected';
}
- $wgOut-addHTML( div
class='mw-warning-with-logexcerpt'\n );
- $wgOut-addWikiMsg( $noticeMsg );
- LogEventsList::showLogExtract( $wgOut, 'protect',
$this-mTitle-getPrefixedText(), '', 1 );
- $wgOut-addHTML( /div\n );
+ LogEventsList::showLogExtract( $wgOut, 'protect',
$this-mTitle-getPrefixedText(), '',
+ array( 'lim' = 1, 'msgKey' = array(
$noticeMsg ) ) );
}
if ( $this-mTitle-isCascadeProtected() ) {
# Is this page under cascading protection from some
source pages?
Modified: trunk/phase3/includes/HistoryPage.php
===
--- trunk/phase3/includes/HistoryPage.php 2009-09-16 17:06:27 UTC (rev
56419)
+++ trunk/phase3/includes/HistoryPage.php 2009-09-16 17:17:16 UTC (rev
56420)
@@ -105,7 +105,13 @@
*/
if( !$this-title-exists() ) {
$wgOut-addWikiMsg( 'nohistory' );
-
[MediaWiki-CVS] SVN: [56421] branches/wmf-deployment-work/extensions/UsabilityInitiative
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56421
Revision: 56421
Author: catrope
Date: 2009-09-16 17:47:04 + (Wed, 16 Sep 2009)
Log Message:
---
wmf-deployment-work: Merge r56417 (pre-deployment usability fixes) from
trunk. Also merge r56195 (NTOC bugfix), made conflict resolution easier.
Modified Paths:
--
branches/wmf-deployment-work/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.hooks.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.i18n.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/NavigableTOC/NavigableTOC.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/UsabilityInitiative.hooks.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/UsabilityInitiative.php
branches/wmf-deployment-work/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.js
branches/wmf-deployment-work/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
branches/wmf-deployment-work/extensions/UsabilityInitiative/js/plugins.combined.js
branches/wmf-deployment-work/extensions/UsabilityInitiative/js/plugins.combined.min.js
Added Paths:
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/images/wikiEditor/toolbar/insert-ilink.png
branches/wmf-deployment-work/extensions/UsabilityInitiative/images/wikiEditor/toolbar/insert-xlink.png
Property Changed:
branches/wmf-deployment-work/extensions/UsabilityInitiative/
branches/wmf-deployment-work/extensions/UsabilityInitiative/js/plugins/jquery.wikiEditor.toc.js
Property changes on: branches/wmf-deployment-work/extensions/UsabilityInitiative
___
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/extensions/UsabilityInitiative:51646
/trunk/extensions/UsabilityInitiative:56207,56209,56296,56333,56355,56417
/trunk/phase3/extensions/UsabilityInitiative:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
===
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
2009-09-16 17:17:16 UTC (rev 56420)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/ClickTracking/ClickTracking.hooks.php
2009-09-16 17:47:04 UTC (rev 56421)
@@ -62,7 +62,7 @@
'wgTrackingToken' =
ClickTrackingHooks::get_session_id()
)
);
- UsabilityInitiativeHooks::addLiteralVariables(
+ UsabilityInitiativeHooks::addVariables(
array(
'wgClickTrackingIsThrottled' =
ClickTrackingHooks::isUserThrottled()
)
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
===
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-09-16 17:17:16 UTC (rev 56420)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-09-16 17:47:04 UTC (rev 56421)
@@ -15,7 +15,9 @@
* Intercept the display of the toolbar, replacing the content of
$toolbar
*/
public static function addToolbar( $toolbar ) {
- global $wgUser, $wgEditToolbarGlobalEnable,
$wgEditToolbarUserEnable;
+ global $wgUser, $wgEditToolbarGlobalEnable;
+ global $wgEditToolbarUserEnable, $wgEditToolbarCGDGlobalEnable;
+ global $wgEditToolbarCGDUserEnable;
// Only proceed if some specific conditions are met
if ( $wgEditToolbarGlobalEnable || ( $wgEditToolbarUserEnable
$wgUser-getOption( 'usebetatoolbar' ) ) ) {
@@ -25,6 +27,9 @@
UsabilityInitiativeHooks::addScript(
'EditToolbar/EditToolbar.js',
$wgEditToolbarStyleVersion
);
+ UsabilityInitiativeHooks::addVariables( array(
+ 'wgEditToolbarCGD' =
$wgEditToolbarCGDGlobalEnable || ( $wgEditToolbarCGDUserEnable
$wgUser-getOption(
[MediaWiki-CVS] SVN: [56422] trunk/extensions/Renameuser/SpecialRenameuser.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56422
Revision: 56422
Author: churchofemacs
Date: 2009-09-16 18:00:33 + (Wed, 16 Sep 2009)
Log Message:
---
Follow-up on r56420 and r56318: adjust SpecialRenameuser to fit to new
LogEventsList::showLogExtract parameter order
Modified Paths:
--
trunk/extensions/Renameuser/SpecialRenameuser.php
Modified: trunk/extensions/Renameuser/SpecialRenameuser.php
===
--- trunk/extensions/Renameuser/SpecialRenameuser.php 2009-09-16 17:47:04 UTC
(rev 56421)
+++ trunk/extensions/Renameuser/SpecialRenameuser.php 2009-09-16 18:00:33 UTC
(rev 56422)
@@ -70,7 +70,8 @@
if ( $title-getNamespace() == NS_USER || $title-getNamespace() ==
NS_USER_TALK ) {
// Get the title for the base userpage
$page = Title::makeTitle( NS_USER, str_replace( ' ', '_',
$title-getBaseText() ) )-getPrefixedDBkey();
- LogEventsList::showLogExtract( $wgOut, 'renameuser', $page, '',
10, array(), false, array( 'renameuser-renamed-notice', $title-getBaseText() )
);
+ LogEventsList::showLogExtract( $wgOut, 'renameuser', $page, '',
array( 'lim' = 10, 'showIfEmpty' = false,
+ 'msgKey' = array( 'renameuser-renamed-notice',
$title-getBaseText() ) ) );
}
return true;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56423] branches/wmf-deployment-work/extensions/UsabilityInitiative/ EditToolbar/EditToolbar.js
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56423
Revision: 56423
Author: catrope
Date: 2009-09-16 18:03:24 + (Wed, 16 Sep 2009)
Log Message:
---
wmf-deployment-work: Merge r56226 (remove namespace dropdown in links
CGD) from trunk to shut up a JS error
Modified Paths:
--
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Property Changed:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:00:33 UTC (rev 56422)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:03:24 UTC (rev 56423)
@@ -759,7 +759,6 @@
div
id=edittoolbar-link-dialog-tab-intformfieldsettabletr\
tdlabel
for=edittoolbar-link-int-target
rel=edittoolbar-tool-link-int-target/label/td\
td\
- select
id=edittoolbar-link-int-target-ns /\
input type=text
id=edittoolbar-link-int-target /\
div
id=edittoolbar-link-int-target-status style=display: inline;/div\
/td\
@@ -788,24 +787,13 @@
request.abort();
}
- var targetNSID = $j(
'#edittoolbar-link-int-target-ns' ).val();
- if ( targetNSID 0 ) {
- // Can't check existence for Special:
or Media: titles
- updateWidget( 'exists' );
- return;
- }
-
- var targetNS = $j(
'#edittoolbar-link-int-target-ns option:selected' ).text();
- if ( targetNS != '' )
- targetNS += ':';
- var targetTitle = $j(
'#edittoolbar-link-int-target' ).val();
- var target = targetNS + targetTitle;
+ var target = $j( '#edittoolbar-link-int-target'
).val();
var cache = $j(
'#edittoolbar-link-int-target-status' ).data( 'existencecache' );
if ( cache[target] ) {
updateWidget( cache[target] );
return;
}
- if ( targetTitle == '' ) {
+ if ( target == '' ) {
// Hide the widget when the textbox is
empty
$j(
'#edittoolbar-link-int-target-status' ).children().hide();
return;
@@ -851,8 +839,6 @@
});
// Build tabs
$j( '#edittoolbar-link-tabs' ).tabs();
- // Set up the namespace selector
- $j( '#edittoolbar-link-int-target-ns'
).namespaceSelector();
// Automatically copy the value of the internal link
page title field to the link text field unless the user
// has changed the link text field - this is a
convience thing since most link texts are going to be the
// the same as the page title
@@ -861,20 +847,12 @@
if ( $j( '#edittoolbar-link-int-text' ).data(
'untouched' ) )
// Defer this until $j(this).val() has
been updated
setTimeout( function() {
- var ns = $j(
'#edittoolbar-link-int-target-ns option:selected' ).text();
- if ( ns != '' )
- ns += ':';
- $j(
'#edittoolbar-link-int-text' ).val( ns + $j( '#edittoolbar-link-int-target'
).val() );
+ $j(
'#edittoolbar-link-int-text' ).val( $j( '#edittoolbar-link-int-target' ).val()
);
}, 0 );
});
$j( '#edittoolbar-link-int-text' ).bind( 'change
keypress paste cut', function() {
$j(this).data( 'untouched',
[MediaWiki-CVS] SVN: [56424] trunk/extensions/UsabilityInitiative/EditToolbar
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56424
Revision: 56424
Author: catrope
Date: 2009-09-16 18:12:40 + (Wed, 16 Sep 2009)
Log Message:
---
EditToolbar: Fix for r56417: put inserted tables on their own line, like before
Modified Paths:
--
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:03:24 UTC (rev 56423)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:12:40 UTC (rev 56424)
@@ -324,7 +324,8 @@
options: {
pre: {|
class=\wikitable\ border=\1\\n|,
periMsg:
'edittoolbar-tool-table-example-old',
- post: \n|}
+ post: \n|},
+ ownline: true
}
}
},
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
===
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-09-16 18:03:24 UTC (rev 56423)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-09-16 18:12:40 UTC (rev 56424)
@@ -19,7 +19,7 @@
/* Configuration */
// Bump the version number every time you change any of the .css/.js files
-$wgEditToolbarStyleVersion = 33;
+$wgEditToolbarStyleVersion = 34;
// Set this to true to simply override the stock toolbar for everyone
$wgEditToolbarGlobalEnable = false;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56425] branches/wmf-deployment-work/extensions/UsabilityInitiative/ EditToolbar
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56425
Revision: 56425
Author: catrope
Date: 2009-09-16 18:20:49 + (Wed, 16 Sep 2009)
Log Message:
---
wmf-deployment-work: Merge r56424 (fix for r56417 which was merged
earlier) from trunk
Modified Paths:
--
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
Property Changed:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Property changes on:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar
___
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646
/trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
===
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:12:40 UTC (rev 56424)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
2009-09-16 18:20:49 UTC (rev 56425)
@@ -324,7 +324,8 @@
options: {
pre: {|
class=\wikitable\ border=\1\\n|,
periMsg:
'edittoolbar-tool-table-example-old',
- post: \n|}
+ post: \n|},
+ ownline: true
}
}
},
Property changes on:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
___
Modified: svn:mergeinfo
-
/branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
+
/branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
===
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-09-16 18:12:40 UTC (rev 56424)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.php
2009-09-16 18:20:49 UTC (rev 56425)
@@ -19,7 +19,7 @@
/* Configuration */
// Bump the version number every time you change any of the .css/.js files
-$wgEditToolbarStyleVersion = 33;
+$wgEditToolbarStyleVersion = 34;
// Set this to true to simply override the stock toolbar for everyone
$wgEditToolbarGlobalEnable = false;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56426] trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar. hooks.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56426
Revision: 56426
Author: catrope
Date: 2009-09-16 18:26:30 + (Wed, 16 Sep 2009)
Log Message:
---
EditToolbar: Fix stupid copypaste mess-up from r56417
Modified Paths:
--
trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
===
--- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-09-16 18:20:49 UTC (rev 56425)
+++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-09-16 18:26:30 UTC (rev 56426)
@@ -221,7 +221,7 @@
);
}
- if ( !$wgEditToolbarGlobalEnable $wgEditToolbarUserEnable ) {
+ if ( !$wgEditToolbarCGDGlobalEnable
$wgEditToolbarCGDGlobalEnable ) {
wfLoadExtensionMessages( 'EditToolbar' );
$defaultPreferences['usebetatoolbar-cgd'] = array(
'type' = 'toggle',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56427] trunk/extensions/Collection/Collection.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56427
Revision: 56427
Author: brion
Date: 2009-09-16 18:27:27 + (Wed, 16 Sep 2009)
Log Message:
---
Security fix: escape client-provided $article string when dropping it into
JavaScript in an HTML element returned for AJAX results
Modified Paths:
--
trunk/extensions/Collection/Collection.php
Modified: trunk/extensions/Collection/Collection.php
===
--- trunk/extensions/Collection/Collection.php 2009-09-16 18:26:30 UTC (rev
56426)
+++ trunk/extensions/Collection/Collection.php 2009-09-16 18:27:27 UTC (rev
56427)
@@ -278,6 +278,12 @@
$wgAjaxExportList[] = 'wfAjaxCollectionClear';
+/**
+ * Backend of several following SAJAX function handlers...
+ * @param String $action provided by the specific handlers internally
+ * @param String $article title passed in from client
+ * @return AjaxResponse with JSON-encoded array including HTML fragment.
+ */
function wfCollectionSuggestAction( $action, $article ) {
wfLoadExtensionMessages( 'CollectionCore' );
wfLoadExtensionMessages( 'Collection' );
@@ -290,7 +296,8 @@
'Book',
array('bookcmd' = 'suggest', 'undo' =
$action, 'arttitle' = $article )
),
- 'onclick' = collectionSuggestCall('UndoArticle',
['$action', '$article']); return false;,
+ 'onclick' = collectionSuggestCall('UndoArticle', .
+ Xml::encodeJsVar( array( $action, $article ) )
. ); return false;,
'title' = wfMsg( 'coll-suggest_undo_tooltip' ),
),
wfMsg( 'coll-suggest_undo' )
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56428] branches/wmf-deployment-work/extensions/UsabilityInitiative/ EditToolbar
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56428
Revision: 56428
Author: catrope
Date: 2009-09-16 18:27:43 + (Wed, 16 Sep 2009)
Log Message:
---
wmf-deployment-work: Merge r56426 (fix stupid mistake in r56417, which
was merged earlier) from trunk
Modified Paths:
--
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
Property Changed:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
Property changes on:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar
___
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646
/trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
+ /branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar:51646
/trunk/extensions/UsabilityInitiative/EditToolbar:56207,56209,56296,56333,56355,56424,56426
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
Modified:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
===
---
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-09-16 18:27:27 UTC (rev 56427)
+++
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.hooks.php
2009-09-16 18:27:43 UTC (rev 56428)
@@ -219,7 +219,7 @@
);
}
- if ( !$wgEditToolbarGlobalEnable $wgEditToolbarUserEnable ) {
+ if ( !$wgEditToolbarCGDGlobalEnable
$wgEditToolbarCGDGlobalEnable ) {
wfLoadExtensionMessages( 'EditToolbar' );
$defaultPreferences['usebetatoolbar-cgd'] = array(
'type' = 'toggle',
Property changes on:
branches/wmf-deployment-work/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js
___
Modified: svn:mergeinfo
-
/branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
+
/branches/REL1_15/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:51646
/trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56207,56209,56226,56296,56333,56355,56417,56424,56426
/trunk/phase3/extensions/UsabilityInitiative/EditToolbar/EditToolbar.js:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56429] trunk/extensions/Collection
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56429
Revision: 56429
Author: brion
Date: 2009-09-16 18:42:58 + (Wed, 16 Sep 2009)
Log Message:
---
Security fix: validate $oldid input parameter and escape it on output when
generating JavaScript code to put into HTML fragments in AJAX responses
Modified Paths:
--
trunk/extensions/Collection/Collection.hooks.php
trunk/extensions/Collection/Collection.php
Modified: trunk/extensions/Collection/Collection.hooks.php
===
--- trunk/extensions/Collection/Collection.hooks.php2009-09-16 18:27:43 UTC
(rev 56428)
+++ trunk/extensions/Collection/Collection.hooks.php2009-09-16 18:42:58 UTC
(rev 56429)
@@ -400,14 +400,16 @@
$captionMsg = 'coll-add_this_page';
$tooltipMsg = 'coll-add_page_tooltip';
$query = array( 'bookcmd' = 'add_article',
'arttitle' = $ptext, 'oldid' = $oldid );
- $onclick = collectionCall('AddArticle',
['removearticle', wgNamespaceNumber, wgTitle, $oldid]); return false;;
+ $onclick = collectionCall('AddArticle',
['removearticle', wgNamespaceNumber, wgTitle, .
+ Xml::encodeJsVar( $oldid ) . ]);
return false;;
} else {
$id = 'coll-remove_article';
$icon = 'silk-remove.png';
$captionMsg = 'coll-remove_this_page';
$tooltipMsg = 'coll-remove_page_tooltip';
$query = array( 'bookcmd' = 'remove_article',
'arttitle' = $ptext, 'oldid' = $oldid );
- $onclick = collectionCall('RemoveArticle',
['addarticle', wgNamespaceNumber, wgTitle, $oldid]); return false;;
+ $onclick = collectionCall('RemoveArticle',
['addarticle', wgNamespaceNumber, wgTitle, .
+ Xml::encodeJsVar( $oldid ) . ]);
return false;;
}
}
Modified: trunk/extensions/Collection/Collection.php
===
--- trunk/extensions/Collection/Collection.php 2009-09-16 18:27:43 UTC (rev
56428)
+++ trunk/extensions/Collection/Collection.php 2009-09-16 18:42:58 UTC (rev
56429)
@@ -207,6 +207,9 @@
$wgAjaxExportList[] = 'wfAjaxCollectionAddCategory';
function wfAjaxCollectionGetBookCreatorBoxContent( $ajaxHint='', $oldid=null )
{
+ if( !is_null( $oldid ) ) {
+ $oldid = intval( $oldid );
+ }
return CollectionHooks::getBookCreatorBoxContent( $ajaxHint, $oldid );
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56431] trunk/extensions/LanguageSelector/LanguageSelector.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56431 Revision: 56431 Author: ialex Date: 2009-09-16 18:57:21 + (Wed, 16 Sep 2009) Log Message: --- fix constant name in documentation Modified Paths: -- trunk/extensions/LanguageSelector/LanguageSelector.php Modified: trunk/extensions/LanguageSelector/LanguageSelector.php === --- trunk/extensions/LanguageSelector/LanguageSelector.php 2009-09-16 18:51:07 UTC (rev 56430) +++ trunk/extensions/LanguageSelector/LanguageSelector.php 2009-09-16 18:57:21 UTC (rev 56431) @@ -39,7 +39,7 @@ * Possible values: * * LANGUAGE_SELECTOR_USE_CONTENT_LANG - use the $wgLanguageCode setting (default content language) * * LANGUAGE_SELECTOR_PREFER_CONTENT_LANG - use the $wgLanguageCode setting, if accepted by the client -* * LANGUAGE_SELECTOR_USE_CONTENT_LANG - use the client's preferred language, if in $wgLanguageSelectorLanguages +* * LANGUAGE_SELECTOR_PREFER_CLIENT_LANG - use the client's preferred language, if in $wgLanguageSelectorLanguages */ $wgLanguageSelectorDetectLanguage = LANGUAGE_SELECTOR_PREFER_CLIENT_LANG; ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56433] trunk/extensions
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56433
Revision: 56433
Author: ialex
Date: 2009-09-16 19:04:16 + (Wed, 16 Sep 2009)
Log Message:
---
svn:eol-style native
Modified Paths:
--
trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
Property Changed:
trunk/extensions/IPAuth/IPAuth.php
trunk/extensions/Lockout/Lockout.php
trunk/extensions/MetavidWiki/mv_embed_iframe.php
trunk/extensions/ReaderFeedback/language/RatedPages.i18n.php
trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
Property changes on: trunk/extensions/IPAuth/IPAuth.php
___
Added: svn:eol-style
+ native
Property changes on: trunk/extensions/Lockout/Lockout.php
___
Added: svn:eol-style
+ native
Property changes on: trunk/extensions/MetavidWiki/mv_embed_iframe.php
___
Added: svn:eol-style
+ native
Property changes on:
trunk/extensions/ReaderFeedback/language/RatedPages.i18n.php
___
Added: svn:eol-style
+ native
Modified: trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
===
--- trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-16 18:59:29 UTC (rev 56432)
+++ trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-16 19:04:16 UTC (rev 56433)
@@ -1,160 +1,160 @@
-?php
-if ( !defined( 'MEDIAWIKI' ) ) {
- echo ReaderFeedback extension\n;
- exit( 1 );
-}
-
-class RatedPages extends SpecialPage
-{
-public function __construct() {
-parent::__construct( 'RatedPages' );
- wfLoadExtensionMessages( 'RatedPages' );
- wfLoadExtensionMessages( 'ReaderFeedback' );
-}
-
-public function execute( $par ) {
-global $wgRequest, $wgOut, $wgUser;
- $this-setHeaders();
- if( $wgUser-isAllowed( 'feedback' ) ) {
- if( $wgUser-isBlocked() ) {
- return $wgOut-blockedPage();
- }
- } else {
- return $wgOut-permissionRequired( 'feedback' );
- }
- if( wfReadOnly() ) {
- return $wgOut-readOnlyPage();
- }
- $this-skin = $wgUser-getSkin();
- # Check if there is a featured level
- $this-namespace = $wgRequest-getInt( 'namespace' );
- $this-tag = $wgRequest-getVal( 'ratingtag' );
- $this-tier = $wgRequest-getInt( 'ratingtier' );
- $this-showForm();
- $this-showPageList();
- }
-
- protected function showForm() {
- global $wgOut, $wgScript, $wgFeedbackNamespaces;
- $form = Xml::openElement( 'form',
- array( 'name' = 'reviewedpages', 'action' =
$wgScript, 'method' = 'get' ) );
- $form .=
fieldsetlegend.wfMsgHtml('ratedpages-leg')./legend\n;
- $form .= Xml::hidden( 'title',
$this-getTitle()-getPrefixedDBKey() );
- $form .= ReaderFeedbackXML::getRatingTierMenu($this-tier) .
'nbsp;';
- if( count($wgFeedbackNamespaces) 1 ) {
- $form .= ReaderFeedbackXML::getNamespaceMenu(
$this-namespace ) . 'nbsp;';
- }
- if( count( ReaderFeedback::getFeedbackTags() ) 0 ) {
- $form .= ReaderFeedbackXML::getTagMenu( $this-tag );
- }
- $form .= .Xml::submitButton( wfMsg( 'go' ) );
- $form .= /fieldset/form\n;
- $wgOut-addHTML( $form );
- }
-
- protected function showPageList() {
- global $wgOut;
- $tags = ReaderFeedback::getFeedbackTags();
- $pager = new LikedPagesPager( $this, array(), $this-namespace,
$this-tag, $this-tier );
- if( isset($tags[$this-tag]) $pager-getNumRows() ) {
- $wgOut-addHTML( wfMsgExt('ratedpages-list',
array('parse') ) );
- $wgOut-addHTML( $pager-getNavigationBar() );
- $wgOut-addHTML( $pager-getBody() );
- $wgOut-addHTML( $pager-getNavigationBar() );
- } elseif( $this-tag ) { // must select first...
- $wgOut-addHTML( wfMsgExt('ratedpages-none',
array('parse') ) );
- }
- }
-
- public function formatRow( $row ) {
- global $wgLang;
- $title = Title::makeTitle( $row-page_namespace,
$row-page_title );
- $link = $this-skin-makeKnownLinkObj( $title,
$title-getPrefixedText() );
- $hist =
[MediaWiki-CVS] SVN: [56435] trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar. i18n.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56435 Revision: 56435 Author: siebrand Date: 2009-09-16 20:19:51 + (Wed, 16 Sep 2009) Log Message: --- Reword and simplify 'edittoolbar-cgd-preference' after discussing this with Roan. Modified Paths: -- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php Modified: trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php === --- trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php 2009-09-16 20:00:13 UTC (rev 56434) +++ trunk/extensions/UsabilityInitiative/EditToolbar/EditToolbar.i18n.php 2009-09-16 20:19:51 UTC (rev 56435) @@ -15,7 +15,7 @@ 'edittoolbar' = 'Editing toolbar', 'edittoolbar-desc' = 'Edit page toolbar with enhanced usability', 'edittoolbar-preference' = 'Enable enhanced editing toolbar', - 'edittoolbar-cgd-preference' = 'Enable content generation dialogs in enhanced editing toolbar', + 'edittoolbar-cgd-preference' = 'Enable help for adding advanced wiki text', 'edittoolbar-loading' = 'Loading...', /* Main Section */ 'edittoolbar-tool-bold' = 'Bold', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56436] trunk/extensions/SemanticMediaWiki/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56436
Revision: 56436
Author: mkroetzsch
Date: 2009-09-16 20:24:06 + (Wed, 16 Sep 2009)
Log Message:
---
fixed direct access to private member
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Linear.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -167,7 +167,7 @@
// delete all previous errors, this is our real problem
/// TODO: probably we should check for this earlier,
but avoid unnecessary DB requests ...
wfLoadExtensionMessages('SemanticMediaWiki');
- $this-m_errors =
array(wfMsgForContent('smw_unknowntype',
SMWDataValueFactory::findTypeLabel($this-getTypeID(;
+ $this-addError(wfMsgForContent('smw_unknowntype',
SMWDataValueFactory::findTypeLabel($this-getTypeID(;
return;
}
$numdv = SMWDataValueFactory::newTypeIDValue('_num'); // used
for parsing the factors
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php 2009-09-16
20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_NAry.php 2009-09-16
20:24:06 UTC (rev 56436)
@@ -229,7 +229,7 @@
* NULL as an indication for omitted values.
*/
public function setDVs($datavalues) {
- $this-m_errors = array(); // clear errors
+ $this-clearErrors(); // clear errors
$this-m_infolinks = array(); // clear links
$this-m_hasssearchlink = false;
$this-m_caption = false;
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Number.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -188,7 +188,7 @@
$this-convertToMainUnit();
return $this-m_value . $this-m_unit;
} else {
- return implode(\t, $this-m_errors);
+ return implode(\t, $this-getErrors());
}
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php 2009-09-16
20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Time.php 2009-09-16
20:24:06 UTC (rev 56436)
@@ -381,7 +381,7 @@
$this-createJD();
return strval($this-m_jd);
} else {
- return implode(\t, $this-m_errors);
+ return implode(\t, $this-getErrors());
}
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -206,7 +206,7 @@
if ($this-isValid()) {
return $this-getPrefixedText();
} else {
- return implode(\t, $this-m_errors);
+ return implode(\t, $this-getErrors());
}
}
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
2009-09-16 20:19:51 UTC (rev 56435)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
2009-09-16 20:24:06 UTC (rev 56436)
@@ -233,6 +233,17 @@
}
}
+ /**
+* Clear error messages. This function is provided temporarily to allow
+* n-ary to do this. Eventually, n-ary should implement its setDBkeys()
+*
[MediaWiki-CVS] SVN: [56437] branches
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56437 Revision: 56437 Author: brion Date: 2009-09-16 20:28:07 + (Wed, 16 Sep 2009) Log Message: --- moving old wmf-deployment branch out to wmf-deployment-old to replace with new one... Added Paths: --- branches/wmf-deployment-old/ Removed Paths: - branches/wmf-deployment/ Property changes on: branches/wmf-deployment-old ___ Added: svn:ignore + *~ .classpath .metadata* .project .settings AdminSettings.php LocalSettings.php StartProfiler.php favicon.ico project.index static* Added: svn:mergeinfo + /branches/REL1_15/phase3:51646 /trunk/phase3: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 ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56438] branches
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56438 Revision: 56438 Author: brion Date: 2009-09-16 20:29:23 + (Wed, 16 Sep 2009) Log Message: --- and swap the new deployment branch into place Added Paths: --- branches/wmf-deployment/ Removed Paths: - branches/wmf-deployment-work/ Property changes on: branches/wmf-deployment ___ Added: svn:ignore + *~ .classpath .metadata* .project .settings AdminSettings.php LocalSettings.php StartProfiler.php favicon.ico project.index static* Added: svn:mergeinfo + /branches/REL1_15/phase3:51646 /trunk/phase3:56213,56215-56216,56218,56325,56334-56336,56338,56340,56343,56345,56347,56350 ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56439] branches/wmf-deployment/extensions/Widgets/
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56439 Revision: 56439 Author: brion Date: 2009-09-16 20:34:43 + (Wed, 16 Sep 2009) Log Message: --- kill unused widgets ext from deployment branch; externals confusion Removed Paths: - branches/wmf-deployment/extensions/Widgets/ ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56440] trunk/extensions/SemanticMediaWiki/specials/SearchTriple/ SMW_SpecialBrowse.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56440
Revision: 56440
Author: mkroetzsch
Date: 2009-09-16 20:40:24 + (Wed, 16 Sep 2009)
Log Message:
---
some code cleanup
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
Modified:
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
===
---
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
2009-09-16 20:34:43 UTC (rev 56439)
+++
trunk/extensions/SemanticMediaWiki/specials/SearchTriple/SMW_SpecialBrowse.php
2009-09-16 20:40:24 UTC (rev 56440)
@@ -36,10 +36,9 @@
* Constructor
*/
public function __construct() {
+ global $smwgBrowseShowAll;
parent::__construct('Browse', '', true, false, 'default', true);
wfLoadExtensionMessages('SemanticMediaWiki');
-
- global $smwgBrowseShowAll;
if ($smwgBrowseShowAll) {
SMWSpecialBrowse::$incomingvaluescount = 21;
SMWSpecialBrowse::$incomingpropertiescount = -1;
@@ -53,7 +52,7 @@
* @param[in] $query string Given by MediaWiki
*/
public function execute( $query ) {
- global $wgRequest, $wgOut;
+ global $wgRequest, $wgOut, $smwgBrowseShowAll;
$this-setHeaders();
// get the GET parameters
$this-articletext = $wgRequest-getVal( 'article' );
@@ -65,13 +64,8 @@
}
$this-subject = SMWDataValueFactory::newTypeIDValue('_wpg',
$this-articletext);
$offsettext = $wgRequest-getVal( 'offset' );
- if ('' == $offsettext) {
- $this-offset = 0;
- } else {
- $this-offset = intval($offsettext);
- }
+ $this-offset = ('' == $offsettext)?0:intval($offsettext);
$dir = $wgRequest-getVal( 'dir' );
- global $smwgBrowseShowAll;
if ($smwgBrowseShowAll) {
$this-showoutgoing = true;
$this-showincoming = true;
@@ -85,8 +79,8 @@
}
/**
-* Create an HTML including the complete factbox, based on the
extracted parameters
-* in the execute comment.
+* Create and output HTML including the complete factbox, based on the
extracted
+* parameters in the execute comment.
*
* @return string A HTML string with the factbox
*/
@@ -120,7 +114,7 @@
}
/**
-* Creates the HTML displaying the data of one subject.
+* Creates the HTML table displaying the data of one subject.
*
* @param[in] $data SMWSemanticData The data to be displayed
* @param[in] $left bool Should properties be displayed on the left
side?
@@ -132,74 +126,52 @@
$skin = $wgUser-getSkin();
// Some of the CSS classes are different for the left or the
right side.
// In this case, there is an i after the smwb-. This is set
here.
- $inv = i;
- if ($left) $inv = ;
- $html = table class=\smwb- . $inv . factbox\
cellpadding=\0\ cellspacing=\0\\n;
+ $inv = $left?'':'i';
+ $html = table class=\smwb- . $inv . factbox\
cellpadding=\0\ cellspacing=\0\\n;
$properties = $data-getProperties();
$noresult = true;
-foreach ($properties as $property) {
+ foreach ($properties as $property) {
$displayline = true;
if ($property-isVisible()) {
$property-setCaption($this-getPropertyLabel($property, $incoming));
$proptext = $property-getShortHTMLText($skin)
. \n;
+ } elseif ($property-getPropertyID() == '_INST') {
+ $proptext = $skin-specialLink( 'Categories' );
+ } elseif ($property-getPropertyID() == '_REDI') {
+ $proptext = $skin-specialLink(
'Listredirects', 'isredirect' );
} else {
-// global $smwgContLang;
-// $proptext =
$smwgContLang-findSpecialPropertyLabel( $property );
-// if ($proptext != '') {
-// $p = Title::newFromText($proptext,
SMW_NS_PROPERTY);
-// $proptext = $skin-makeLinkObj($p,
$this-unbreak($proptext));
-// $displayline = true;
-// }
- if ($property-getPropertyID() == '_INST') {
-
[MediaWiki-CVS] SVN: [56441] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56441
Revision: 56441
Author: ialex
Date: 2009-09-16 20:43:14 + (Wed, 16 Sep 2009)
Log Message:
---
* (bug 20517) Cancel link from edit page now returns to the old version when
editing an old version
Modified Paths:
--
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/EditPage.php
Modified: trunk/phase3/RELEASE-NOTES
===
--- trunk/phase3/RELEASE-NOTES 2009-09-16 20:40:24 UTC (rev 56440)
+++ trunk/phase3/RELEASE-NOTES 2009-09-16 20:43:14 UTC (rev 56441)
@@ -502,6 +502,8 @@
* (bug 18180) Special:Export ignores limit, dir, offset parameters
* User::getBlockedStatus() works for all kinds of user objects and doesn't
assume the user object is equal to the current-user object ($wgUser)
+* (bug 20517) Cancel link from edit page now returns to the old version when
+ editing an old version
== API changes in 1.16 ==
Modified: trunk/phase3/includes/EditPage.php
===
--- trunk/phase3/includes/EditPage.php 2009-09-16 20:40:24 UTC (rev 56440)
+++ trunk/phase3/includes/EditPage.php 2009-09-16 20:43:14 UTC (rev 56441)
@@ -1196,6 +1196,8 @@
# Enabled article-related sidebar, toplinks, etc.
$wgOut-setArticleRelated( true );
+ $cancelParams = array();
+
if ( $this-isConflict ) {
$wgOut-wrapWikiMsg( div
class='mw-explainconflict'\n$1/div, 'explainconflict' );
@@ -1246,6 +1248,7 @@
if ( !$this-mArticle-mRevision-isCurrent() )
{
$this-mArticle-setOldSubtitle(
$this-mArticle-mRevision-getId() );
+ $cancelParams['oldid'] =
$this-mArticle-mRevision-getId();
$wgOut-addWikiMsg( 'editingold' );
}
}
@@ -1325,7 +1328,7 @@
$wgTitle,
wfMsgExt( 'cancel', array( 'parseinline' ) ),
array( 'id' = 'mw-editform-cancel' ),
- array(),
+ $cancelParams,
array( 'known', 'noclasses' )
);
$separator = wfMsgExt( 'pipe-separator' , 'escapenoentities' );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56442] trunk/extensions/SemanticMediaWiki/includes
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56442
Revision: 56442
Author: mkroetzsch
Date: 2009-09-16 21:02:38 + (Wed, 16 Sep 2009)
Log Message:
---
some code cleanup
Modified Paths:
--
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_String.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Types.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
trunk/extensions/SemanticMediaWiki/includes/SMW_DataValue.php
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_String.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_String.php
2009-09-16 20:43:14 UTC (rev 56441)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_String.php
2009-09-16 21:02:38 UTC (rev 56442)
@@ -21,7 +21,7 @@
wfLoadExtensionMessages('SemanticMediaWiki');
if ($value!='') {
$this-m_value = $value;
- if ( (strlen($this-m_value) 255) ($this-m_typeid
!= '_txt') ($this-m_typeid != '_cod') ) { // limit size (for DB indexing)
+ if ( ($this-m_typeid != '_txt') ($this-m_typeid !=
'_cod') (strlen($this-m_value) 255) ) { // limit size (for DB indexing)
$this-addError(wfMsgForContent('smw_maxstring', mb_substr($value, 0, 42) . '
span class=smwwarning[hellip;]/span ' . mb_substr($value,
mb_strlen($this-m_value) - 42)));
}
} else {
@@ -52,22 +52,14 @@
}
public function getLongWikiText($linked = NULL) {
- if (!$this-isValid()) {
- return $this-getErrorText();
- } else {
- return $this-getAbbValue($linked,$this-m_value);
- }
+ return
$this-isValid()?$this-getAbbValue($linked,$this-m_value):$this-getErrorText();
}
/**
* @todo Rather parse input to obtain properly formatted HTML.
*/
public function getLongHTMLText($linker = NULL) {
- if (!$this-isValid()) {
- return $this-getErrorText();
- } else {
- return
$this-getAbbValue($linker,smwfXMLContentEncode($this-m_value));
- }
+ return
$this-isValid()?$this-getAbbValue($linker,smwfXMLContentEncode($this-m_value)):$this-getErrorText();
}
public function getDBkeys() {
@@ -84,8 +76,9 @@
$this-unstub();
if ( ($this-m_typeid != '_txt') ($this-m_typeid != '_cod')
) {
return SMWDataValue::getInfolinks();
+ } else {
+ return $this-m_infolinks;
}
- return $this-m_infolinks;
}
protected function getServiceLinkParams() {
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Types.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Types.php
2009-09-16 20:43:14 UTC (rev 56441)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_Types.php
2009-09-16 21:02:38 UTC (rev 56442)
@@ -245,11 +245,8 @@
*/
public function getTypeLabels() {
$this-initTypeData();
- if ($this-m_typelabels === false) {
- return array(); // fallback for unary callers
- } else {
- return $this-m_typelabels;
- }
+ // fallback to array() for unary callers
+ return ($this-m_typelabels ===
false)?array():$this-m_typelabels;
}
/**
@@ -258,11 +255,8 @@
*/
public function getTypeCaptions() {
$this-initTypeData();
- if ($this-m_typecaptions === false) {
- return array(); // fallback for unary callers
- } else {
- return $this-m_typecaptions;
- }
+ // fallback to array() for unary callers
+ return ($this-m_typecaptions ===
false)?array():$this-m_typecaptions;
}
/**
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
===
--- trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
2009-09-16 20:43:14 UTC (rev 56441)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_DV_WikiPage.php
2009-09-16 21:02:38 UTC (rev 56442)
@@ -139,12 +139,10 @@
if ( ($linker !== NULL) ($this-m_caption !== '')
($this-m_outformat != '-') ) { $this-getTitle(); } // init the Title object,
may reveal hitherto unnoticed errors
if ( ($linker === NULL) || (!$this-isValid()) ||
($this-m_outformat == '-') || ($this-m_caption === '') ) {
[MediaWiki-CVS] SVN: [56443] branches/wmf-deployment/maintenance/jobs-loop.sh
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56443 Revision: 56443 Author: brion Date: 2009-09-16 21:09:08 + (Wed, 16 Sep 2009) Log Message: --- uncommitted live hack :P Modified Paths: -- branches/wmf-deployment/maintenance/jobs-loop.sh Modified: branches/wmf-deployment/maintenance/jobs-loop.sh === --- branches/wmf-deployment/maintenance/jobs-loop.sh2009-09-16 21:02:38 UTC (rev 56442) +++ branches/wmf-deployment/maintenance/jobs-loop.sh2009-09-16 21:09:08 UTC (rev 56443) @@ -6,7 +6,7 @@ type=$1 } -cd `readlink -f /home/wikipedia/common/php/maintenance` +cd `readlink -f /usr/local/apache/common/wmf-deployment/maintenance` while [ 1 ];do db= while [ -z $db ];do ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56444] trunk/phase3/includes/OutputPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56444
Revision: 56444
Author: brion
Date: 2009-09-16 21:31:17 + (Wed, 16 Sep 2009)
Log Message:
---
Fix for wikibits.js loading when $wgStylePath != $wgScriptPath/skins
Modified Paths:
--
trunk/phase3/includes/OutputPage.php
Modified: trunk/phase3/includes/OutputPage.php
===
--- trunk/phase3/includes/OutputPage.php2009-09-16 21:09:08 UTC (rev
56443)
+++ trunk/phase3/includes/OutputPage.php2009-09-16 21:31:17 UTC (rev
56444)
@@ -171,7 +171,7 @@
* Add the core scripts that are included on every page, for later
output into the header
*/
function addCoreScripts2Top(){
- global $wgEnableScriptLoader, $wgJSAutoloadLocalClasses,
$wgScriptPath, $wgEnableJS2system;
+ global $wgEnableScriptLoader, $wgJSAutoloadLocalClasses,
$wgScriptPath, $wgStylePath, $wgEnableJS2system;
// @todo We should deprecate wikibits in favor of mv_embed and
jQuery
if( $wgEnableJS2system ){
@@ -186,7 +186,16 @@
$so = '';
foreach( $core_classes as $s ){
if( isset( $wgJSAutoloadLocalClasses[$s] ) ){
- $so .= Html::linkedScript(
{$wgScriptPath}/{$wgJSAutoloadLocalClasses[$s]}? . $this-getURIDparam() );
+ $path = $wgJSAutoloadLocalClasses[$s];
+ // @fixme this is an awful hack
+ if( substr( $path, 0, 4 ) == http ||
substr( $path, 0, 1 ) == '/' ) {
+ // Assume a full or local path
+ } elseif( substr( $path, 0, 6 ) ==
skins/ ) {
+ $path = $wgStylePath . substr(
$path, 5 );
+ } else {
+ $path = $wgScriptPath . / .
$path;
+ }
+ $so .= Html::linkedScript( $path . ?
. $this-getURIDparam() );
}
}
$this-mScripts = $so . $this-mScripts;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56447] trunk/extensions/CentralAuth/SpecialGlobalGroupMembership.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56447
Revision: 56447
Author: mrzman
Date: 2009-09-16 21:37:33 + (Wed, 16 Sep 2009)
Log Message:
---
r56133 made fetchUser static
Modified Paths:
--
trunk/extensions/CentralAuth/SpecialGlobalGroupMembership.php
Modified: trunk/extensions/CentralAuth/SpecialGlobalGroupMembership.php
===
--- trunk/extensions/CentralAuth/SpecialGlobalGroupMembership.php
2009-09-16 21:35:38 UTC (rev 56446)
+++ trunk/extensions/CentralAuth/SpecialGlobalGroupMembership.php
2009-09-16 21:37:33 UTC (rev 56447)
@@ -72,7 +72,7 @@
}
}
- function fetchUser( $username ) {
+ static function fetchUser( $username ) {
global $wgUser, $wgRequest;
$knownwiki = $wgRequest-getVal('wpKnownWiki');
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56448] trunk/phase3/includes/specials/SpecialUserrights.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56448
Revision: 56448
Author: mrzman
Date: 2009-09-16 21:38:45 + (Wed, 16 Sep 2009)
Log Message:
---
use fetchUser statically per r56133
Modified Paths:
--
trunk/phase3/includes/specials/SpecialUserrights.php
Modified: trunk/phase3/includes/specials/SpecialUserrights.php
===
--- trunk/phase3/includes/specials/SpecialUserrights.php2009-09-16
21:37:33 UTC (rev 56447)
+++ trunk/phase3/includes/specials/SpecialUserrights.php2009-09-16
21:38:45 UTC (rev 56448)
@@ -144,7 +144,7 @@
function saveUserGroups( $username, $reason = '' ) {
global $wgRequest, $wgUser, $wgGroupsAddToSelf,
$wgGroupsRemoveFromSelf;
- $user = $this-fetchUser( $username );
+ $user = self::fetchUser( $username );
if( $user instanceof WikiErrorMsg ) {
$wgOut-addWikiMsgArray( $user-getMessageKey(),
$user-getMessageArgs() );
return;
@@ -250,7 +250,7 @@
function editUserGroupsForm( $username ) {
global $wgOut;
- $user = $this-fetchUser( $username );
+ $user = self::fetchUser( $username );
if( $user instanceof WikiErrorMsg ) {
$wgOut-addWikiMsgArray( $user-getMessageKey(),
$user-getMessageArgs() );
return;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56450] branches/wmf-deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56450
Revision: 56450
Author: brion
Date: 2009-09-16 21:50:42 + (Wed, 16 Sep 2009)
Log Message:
---
Merge r56447 and r56448: fixes needed for CentralAuth derived userrights module
since changes to make fetchUser call static
Modified Paths:
--
branches/wmf-deployment/extensions/CentralAuth/SpecialGlobalGroupMembership.php
branches/wmf-deployment/includes/specials/SpecialUserrights.php
Modified:
branches/wmf-deployment/extensions/CentralAuth/SpecialGlobalGroupMembership.php
===
---
branches/wmf-deployment/extensions/CentralAuth/SpecialGlobalGroupMembership.php
2009-09-16 21:38:52 UTC (rev 56449)
+++
branches/wmf-deployment/extensions/CentralAuth/SpecialGlobalGroupMembership.php
2009-09-16 21:50:42 UTC (rev 56450)
@@ -72,7 +72,7 @@
}
}
- function fetchUser( $username ) {
+ static function fetchUser( $username ) {
global $wgUser, $wgRequest;
$knownwiki = $wgRequest-getVal('wpKnownWiki');
Modified: branches/wmf-deployment/includes/specials/SpecialUserrights.php
===
--- branches/wmf-deployment/includes/specials/SpecialUserrights.php
2009-09-16 21:38:52 UTC (rev 56449)
+++ branches/wmf-deployment/includes/specials/SpecialUserrights.php
2009-09-16 21:50:42 UTC (rev 56450)
@@ -144,7 +144,7 @@
function saveUserGroups( $username, $reason = '' ) {
global $wgRequest, $wgUser, $wgGroupsAddToSelf,
$wgGroupsRemoveFromSelf;
- $user = $this-fetchUser( $username );
+ $user = self::fetchUser( $username );
if( $user instanceof WikiErrorMsg ) {
$wgOut-addWikiMsgArray( $user-getMessageKey(),
$user-getMessageArgs() );
return;
@@ -250,7 +250,7 @@
function editUserGroupsForm( $username ) {
global $wgOut;
- $user = $this-fetchUser( $username );
+ $user = self::fetchUser( $username );
if( $user instanceof WikiErrorMsg ) {
$wgOut-addWikiMsgArray( $user-getMessageKey(),
$user-getMessageArgs() );
return;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56451] trunk/phase3/includes/specials/SpecialBlankpage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56451
Revision: 56451
Author: demon
Date: 2009-09-16 21:53:40 + (Wed, 16 Sep 2009)
Log Message:
---
fix headers
Modified Paths:
--
trunk/phase3/includes/specials/SpecialBlankpage.php
Modified: trunk/phase3/includes/specials/SpecialBlankpage.php
===
--- trunk/phase3/includes/specials/SpecialBlankpage.php 2009-09-16 21:50:42 UTC
(rev 56450)
+++ trunk/phase3/includes/specials/SpecialBlankpage.php 2009-09-16 21:53:40 UTC
(rev 56451)
@@ -11,6 +11,7 @@
}
public function execute( $par ) {
global $wgOut;
+ $this-setHeaders();
$wgOut-addWikiMsg('intentionallyblankpage');
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56452] branches/wmf-deployment/includes/specials/SpecialBlankpage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56452
Revision: 56452
Author: brion
Date: 2009-09-16 21:58:13 + (Wed, 16 Sep 2009)
Log Message:
---
Merge r56451 -- header fix for Special:Blankpage
Modified Paths:
--
branches/wmf-deployment/includes/specials/SpecialBlankpage.php
Modified: branches/wmf-deployment/includes/specials/SpecialBlankpage.php
===
--- branches/wmf-deployment/includes/specials/SpecialBlankpage.php
2009-09-16 21:53:40 UTC (rev 56451)
+++ branches/wmf-deployment/includes/specials/SpecialBlankpage.php
2009-09-16 21:58:13 UTC (rev 56452)
@@ -11,6 +11,7 @@
}
public function execute( $par ) {
global $wgOut;
+ $this-setHeaders();
$wgOut-addWikiMsg('intentionallyblankpage');
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56454] trunk/phase3/includes/Html.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56454
Revision: 56454
Author: aaron
Date: 2009-09-16 22:52:15 + (Wed, 16 Sep 2009)
Log Message:
---
Default $attribs to an array in expandAttributes()
Modified Paths:
--
trunk/phase3/includes/Html.php
Modified: trunk/phase3/includes/Html.php
===
--- trunk/phase3/includes/Html.php 2009-09-16 22:11:35 UTC (rev 56453)
+++ trunk/phase3/includes/Html.php 2009-09-16 22:52:15 UTC (rev 56454)
@@ -286,7 +286,7 @@
* @return string HTML fragment that goes between element name and ''
* (starting with a space if at least one attribute is output)
*/
- public static function expandAttributes( $attribs ) {
+ public static function expandAttributes( $attribs = array() ) {
global $wgHtml5, $wgWellFormedXml;
$ret = '';
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56455] trunk/phase3/includes/specials/SpecialFewestrevisions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56455
Revision: 56455
Author: brion
Date: 2009-09-16 23:17:56 + (Wed, 16 Sep 2009)
Log Message:
---
fix for bad entries
Modified Paths:
--
trunk/phase3/includes/specials/SpecialFewestrevisions.php
Modified: trunk/phase3/includes/specials/SpecialFewestrevisions.php
===
--- trunk/phase3/includes/specials/SpecialFewestrevisions.php 2009-09-16
22:52:15 UTC (rev 56454)
+++ trunk/phase3/includes/specials/SpecialFewestrevisions.php 2009-09-16
23:17:56 UTC (rev 56455)
@@ -53,6 +53,10 @@
global $wgLang, $wgContLang;
$nt = Title::makeTitleSafe( $result-namespace, $result-title
);
+ if( !$nt ) {
+ return '!-- bad title --';
+ }
+
$text = $wgContLang-convert( $nt-getPrefixedText() );
$plink = $skin-linkKnown(
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56456] branches/wmf-deployment/includes/specials/ SpecialFewestrevisions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56456
Revision: 56456
Author: brion
Date: 2009-09-16 23:19:37 + (Wed, 16 Sep 2009)
Log Message:
---
merge r56455 -- fix for Special:Fewestrevisions bad entries
Modified Paths:
--
branches/wmf-deployment/includes/specials/SpecialFewestrevisions.php
Modified: branches/wmf-deployment/includes/specials/SpecialFewestrevisions.php
===
--- branches/wmf-deployment/includes/specials/SpecialFewestrevisions.php
2009-09-16 23:17:56 UTC (rev 56455)
+++ branches/wmf-deployment/includes/specials/SpecialFewestrevisions.php
2009-09-16 23:19:37 UTC (rev 56456)
@@ -53,6 +53,10 @@
global $wgLang, $wgContLang;
$nt = Title::makeTitleSafe( $result-namespace, $result-title
);
+ if( !$nt ) {
+ return '!-- bad title --';
+ }
+
$text = $wgContLang-convert( $nt-getPrefixedText() );
$plink = $skin-linkKnown(
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56457] trunk/phase3/maintenance/interwiki.sql
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56457
Revision: 56457
Author: demon
Date: 2009-09-16 23:27:18 + (Wed, 16 Sep 2009)
Log Message:
---
Add mw :)
Modified Paths:
--
trunk/phase3/maintenance/interwiki.sql
Modified: trunk/phase3/maintenance/interwiki.sql
===
--- trunk/phase3/maintenance/interwiki.sql 2009-09-16 23:19:37 UTC (rev
56456)
+++ trunk/phase3/maintenance/interwiki.sql 2009-09-16 23:27:18 UTC (rev
56457)
@@ -46,6 +46,7 @@
('metawikipedia','http://meta.wikimedia.org/wiki/$1',0),
('moinmoin','http://purl.net/wiki/moin/$1',0),
('mozillawiki','http://wiki.mozilla.org/index.php/$1',0),
+('mw','http://www.mediawiki.org/wiki/$1',0),
('oeis','http://www.research.att.com/cgi-bin/access.cgi/as/njas/sequences/eisA.cgi?Anum=$1',0),
('openfacts','http://openfacts.berlios.de/index.phtml?title=$1',0),
('openwiki','http://openwiki.com/?$1',0),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56458] trunk/phase3/languages/classes/LanguageZh.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56458
Revision: 56458
Author: werdna
Date: 2009-09-16 23:50:29 + (Wed, 16 Sep 2009)
Log Message:
---
Partial revert of r55415, calling wfMsg in Language object constructor causes
unstub loops
Modified Paths:
--
trunk/phase3/languages/classes/LanguageZh.php
Modified: trunk/phase3/languages/classes/LanguageZh.php
===
--- trunk/phase3/languages/classes/LanguageZh.php 2009-09-16 23:27:18 UTC
(rev 56457)
+++ trunk/phase3/languages/classes/LanguageZh.php 2009-09-16 23:50:29 UTC
(rev 56458)
@@ -135,14 +135,6 @@
$variants_all =
array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
$variants = array();
- // If a wiki disabled some variants,
- // LanguageConverter shouldn't process them
- foreach( $variants_all as $variant ) {
- $status = wfMsgExt( variantname-$variant, array(
'parsemag', 'language' = $this ) );
- if( trim($status) != 'disable' )
- $variants[] = $variant;
- }
-
$variantfallbacks = array(
'zh' =
array('zh-hans','zh-hant','zh-cn','zh-tw','zh-hk','zh-sg','zh-mo','zh-my'),
'zh-hans' = array('zh-cn','zh-sg','zh-my'),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56459] trunk/phase3/languages/classes/LanguageZh.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56459
Revision: 56459
Author: werdna
Date: 2009-09-16 23:53:31 + (Wed, 16 Sep 2009)
Log Message:
---
Fix E_NOTICE in r55415 breaking Zh variants
Modified Paths:
--
trunk/phase3/languages/classes/LanguageZh.php
Modified: trunk/phase3/languages/classes/LanguageZh.php
===
--- trunk/phase3/languages/classes/LanguageZh.php 2009-09-16 23:50:29 UTC
(rev 56458)
+++ trunk/phase3/languages/classes/LanguageZh.php 2009-09-16 23:53:31 UTC
(rev 56459)
@@ -132,8 +132,7 @@
global $wgHooks;
parent::__construct();
- $variants_all =
array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
- $variants = array();
+ $variants =
array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
$variantfallbacks = array(
'zh' =
array('zh-hans','zh-hant','zh-cn','zh-tw','zh-hk','zh-sg','zh-mo','zh-my'),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56460] branches/wmf-deployment/languages/classes/LanguageZh.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56460
Revision: 56460
Author: brion
Date: 2009-09-16 23:55:40 + (Wed, 16 Sep 2009)
Log Message:
---
Merge r56458, r56459 from trunk -- fix unstub loops in zh
Modified Paths:
--
branches/wmf-deployment/languages/classes/LanguageZh.php
Modified: branches/wmf-deployment/languages/classes/LanguageZh.php
===
--- branches/wmf-deployment/languages/classes/LanguageZh.php2009-09-16
23:53:31 UTC (rev 56459)
+++ branches/wmf-deployment/languages/classes/LanguageZh.php2009-09-16
23:55:40 UTC (rev 56460)
@@ -132,17 +132,8 @@
global $wgHooks;
parent::__construct();
- $variants_all =
array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
- $variants = array();
+ $variants =
array('zh','zh-hans','zh-hant','zh-cn','zh-hk','zh-mo','zh-my','zh-sg','zh-tw');
- // If a wiki disabled some variants,
- // LanguageConverter shouldn't process them
- foreach( $variants_all as $variant ) {
- $status = wfMsgExt( variantname-$variant, array(
'parsemag', 'language' = $this ) );
- if( trim($status) != 'disable' )
- $variants[] = $variant;
- }
-
$variantfallbacks = array(
'zh' =
array('zh-hans','zh-hant','zh-cn','zh-tw','zh-hk','zh-sg','zh-mo','zh-my'),
'zh-hans' = array('zh-cn','zh-sg','zh-my'),
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56461] trunk/phase3/languages/messages
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56461 Revision: 56461 Author: shinjiman Date: 2009-09-16 23:58:18 + (Wed, 16 Sep 2009) Log Message: --- Localisation updates Cantonese, Chinese and Literary Chinese Modified Paths: -- trunk/phase3/languages/messages/MessagesLzh.php trunk/phase3/languages/messages/MessagesYue.php trunk/phase3/languages/messages/MessagesZh_hans.php trunk/phase3/languages/messages/MessagesZh_hant.php Modified: trunk/phase3/languages/messages/MessagesLzh.php === --- trunk/phase3/languages/messages/MessagesLzh.php 2009-09-16 23:55:40 UTC (rev 56460) +++ trunk/phase3/languages/messages/MessagesLzh.php 2009-09-16 23:58:18 UTC (rev 56461) @@ -1995,6 +1995,8 @@ 'contribslink'= '勛', 'autoblocker' = '近日$1$2；同子IP址，故禁焉。', 'blocklogpage'= '誌禁', +'blocklog-showlog'= '此簿曾被禁。誌禁示下：', +'blocklog-showsuppresslog'= '此簿曾被禁隱。誌廢示下：', 'blocklogentry' = '禁[[$1]]屆$2$3', 'reblock-logentry'= '改[[$1]]之禁，屆$2$3', 'blocklogtext'= '此誌禁赦；自禁不示。見[[Special:IPBlockList|此]]列今禁者。', Modified: trunk/phase3/languages/messages/MessagesYue.php === --- trunk/phase3/languages/messages/MessagesYue.php 2009-09-16 23:55:40 UTC (rev 56460) +++ trunk/phase3/languages/messages/MessagesYue.php 2009-09-16 23:58:18 UTC (rev 56461) @@ -2227,6 +2227,8 @@ 'contribslink'= '貢獻', 'autoblocker' = '已經自動封鎖，因為你嘅IP地址冇幾耐之前[[User:$1|$1]]使用過。$1\\嘅封鎖原因係: 「$2」', 'blocklogpage'= '封鎖日誌', +'blocklog-showlog'= '呢位用戶已經響之前被封鎖過。響下面提供咗封鎖紀錄以便參考：', +'blocklog-showsuppresslog'= '呢位用戶已經響之前被封鎖同隱藏過。響下面提供咗廢止紀錄以便參考：', 'blocklogentry' = '已封鎖[[$1]]，到期時間為$2 $3', 'reblock-logentry'= '已改[[$1]]嘅封鎖設定，到期時間為$2 $3', 'blocklogtext'= '呢個係封鎖同埋解封動作嘅日誌。自動封鎖IP地址嘅動作冇列出嚟。去[[Special:IPBlockList|IP封鎖名單]]睇現時生效嘅封鎖名單', Modified: trunk/phase3/languages/messages/MessagesZh_hans.php === --- trunk/phase3/languages/messages/MessagesZh_hans.php 2009-09-16 23:55:40 UTC (rev 56460) +++ trunk/phase3/languages/messages/MessagesZh_hans.php 2009-09-16 23:58:18 UTC (rev 56461) @@ -2275,6 +2275,8 @@ 'autoblocker' = '因为您与“[[User:$1|$1]]”共享一个IP地址而被自动查封。 $1被封禁的理由是“$2”', 'blocklogpage'= '封禁日志', +'blocklog-showlog'= '这位用户曾经被封锁过。在下列提供封锁日志以便参考：', +'blocklog-showsuppresslog'= '这位用户曾经被封锁和隐藏过。在下列提供废止日志以便参考：', 'blocklogentry' = '已封禁[[$1]]，到期时间为$2 $3', 'reblock-logentry'= '更改[[$1]]的封禁設定時間 $2 $3', 'blocklogtext'= '这是关于用户查封和解封操作的日志。 Modified: trunk/phase3/languages/messages/MessagesZh_hant.php === --- trunk/phase3/languages/messages/MessagesZh_hant.php 2009-09-16 23:55:40 UTC (rev 56460) +++ trunk/phase3/languages/messages/MessagesZh_hant.php 2009-09-16 23:58:18 UTC (rev 56461) @@ -2262,6 +2262,8 @@ 'autoblocker' = '因為您與“[[User:$1|$1]]”共享一個IP地址而被自動查封。 $1被封禁的理由是“$2”', 'blocklogpage'= '封鎖記錄', +'blocklog-showlog'= '這位用戶曾經被封鎖過。在下列提供封鎖記錄以便參考：', +'blocklog-showsuppresslog'= '這位用戶曾經被封鎖和隱藏過。在下列提供廢止記錄以便參考：', 'blocklogentry' = '已封鎖[[$1]]，到期時間為$2 $3', 'reblock-logentry'= '更改[[$1]]的封禁設定時間 $2 $3', 'blocklogtext'= '這是關於用戶封禁和解除封禁操作的記錄。被自動封禁的IP地址沒有被列出。請參閱[[Special:IPBlockList|被查封的IP地址和用戶列表]]。', ___ MediaWiki-CVS mailing list MediaWiki-CVS@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56462] trunk/phase3/languages/LanguageConverter.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56462
Revision: 56462
Author: aaron
Date: 2009-09-16 23:59:25 + (Wed, 16 Sep 2009)
Log Message:
---
$nt may or may not be an object
Modified Paths:
--
trunk/phase3/languages/LanguageConverter.php
Modified: trunk/phase3/languages/LanguageConverter.php
===
--- trunk/phase3/languages/LanguageConverter.php2009-09-16 23:58:18 UTC
(rev 56461)
+++ trunk/phase3/languages/LanguageConverter.php2009-09-16 23:59:25 UTC
(rev 56462)
@@ -566,7 +566,7 @@
function findVariantLink( $link, $nt, $ignoreOtherCond = false ) {
# If the article has already existed, there is no need to
# check it again, otherwise it may cause a fault.
- if ( $nt-exists() )
+ if ( is_object( $nt ) $nt-exists() )
return;
global $wgDisableLangConversion, $wgDisableTitleConversion,
$wgRequest, $wgUser;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56463] trunk/extensions/CodeReview/ui/CodeAuthorListView.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56463
Revision: 56463
Author: demon
Date: 2009-09-16 23:59:56 + (Wed, 16 Sep 2009)
Log Message:
---
Fix link to author views.
Modified Paths:
--
trunk/extensions/CodeReview/ui/CodeAuthorListView.php
Modified: trunk/extensions/CodeReview/ui/CodeAuthorListView.php
===
--- trunk/extensions/CodeReview/ui/CodeAuthorListView.php 2009-09-16
23:59:25 UTC (rev 56462)
+++ trunk/extensions/CodeReview/ui/CodeAuthorListView.php 2009-09-16
23:59:56 UTC (rev 56463)
@@ -10,11 +10,11 @@
function execute() {
global $wgOut;
$authors = $this-mRepo-getAuthorList();
- $name = $this-mRepo-getName();
+ $repo = $this-mRepo-getName();
$text = wfMsg( 'code-authors-text' ) . \n;
foreach ( $authors as $committer ) {
if ( $committer ) {
- $text .= *
[[Special:Code/$name/author/$committer|$committer]];
+ $text .= *
[[Special:Code/$repo/author/$committer|$committer]];
$user =
$this-mRepo-authorWikiUser($committer);
if( $user ) {
$title = htmlspecialchars(
$user-getUserPage()-getPrefixedText() );
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56464] trunk/extensions/CodeReview
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56464
Revision: 56464
Author: aaron
Date: 2009-09-17 00:12:43 + (Thu, 17 Sep 2009)
Log Message:
---
Bump releasenote range limit and actually give a notice when out of it
Modified Paths:
--
trunk/extensions/CodeReview/CodeReview.i18n.php
trunk/extensions/CodeReview/ui/CodeReleaseNotes.php
Modified: trunk/extensions/CodeReview/CodeReview.i18n.php
===
--- trunk/extensions/CodeReview/CodeReview.i18n.php 2009-09-16 23:59:56 UTC
(rev 56463)
+++ trunk/extensions/CodeReview/CodeReview.i18n.php 2009-09-17 00:12:43 UTC
(rev 56464)
@@ -95,6 +95,7 @@
'code-release-legend' = 'Generate release notes',
'code-release-startrev' = 'Start rev:',
'code-release-endrev' = 'Last rev:',
+ 'code-release-badrange' = 'Range is too large!',
'codereview-subtitle' = 'For $1',
Modified: trunk/extensions/CodeReview/ui/CodeReleaseNotes.php
===
--- trunk/extensions/CodeReview/ui/CodeReleaseNotes.php 2009-09-16 23:59:56 UTC
(rev 56463)
+++ trunk/extensions/CodeReview/ui/CodeReleaseNotes.php 2009-09-17 00:12:43 UTC
(rev 56464)
@@ -27,8 +27,11 @@
$this-showForm();
# Sanity/performance check...
$lastRev = $this-mRepo-getLastStoredRev();
- if ( $this-mStartRev ( $lastRev - 3000 ) )
- $this-mStartRev = NULL;
+ if ( $this-mStartRev ( $lastRev - 5000 ) ) {
+ global $wgOut;
+ $wgOut-addHtml( wfMsgHtml('code-release-badrange') );
+ return;
+ }
# Show notes if we have at least a starting revision
if ( $this-mStartRev ) {
$this-showReleaseNotes();
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56465] trunk/extensions/Translate/TranslateEditAddons.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56465
Revision: 56465
Author: purodha
Date: 2009-09-17 00:13:19 + (Thu, 17 Sep 2009)
Log Message:
---
Show diff of original English message when translation is fuzzied.
Modified Paths:
--
trunk/extensions/Translate/TranslateEditAddons.php
Modified: trunk/extensions/Translate/TranslateEditAddons.php
===
--- trunk/extensions/Translate/TranslateEditAddons.php 2009-09-17 00:12:43 UTC
(rev 56464)
+++ trunk/extensions/Translate/TranslateEditAddons.php 2009-09-17 00:13:19 UTC
(rev 56465)
@@ -288,13 +288,14 @@
$en = $group-getMessage( $key, 'en' );
$xx = $group-getMessage( $key, $code );
-
// Set-up the content area contents properly and not randomly
as in
// MediaWiki core. $translation is also used for checks later
on. Also
// add the fuzzy string if necessary.
$translation = TranslateUtils::getMessageContent( $key, $code,
$nsMain );
+ $isfuzzy = false;
if ( $translation !== null ) {
- if ( !self::hasFuzzyString( $translation)
self::isFuzzy( $object-mTitle ) ) {
+ $isfuzzy = self::isFuzzy( $object-mTitle );
+ if ( !self::hasFuzzyString( $translation) $isfuzzy )
{
$translation = TRANSLATE_FUZZY . $translation;
}
} else {
@@ -402,8 +403,11 @@
}
}
+ // Diff of current version of original, and its version before
last edit of translation, if any
global $wgEnablePageTranslation;
- if ( $wgEnablePageTranslation $group instanceof
WikiPageMessageGroup ) {
+ $showdiff1 = ( $wgEnablePageTranslation $group instanceof
WikiPageMessageGroup );
+ $showdiff2 = ( $isfuzzy );
+ if ( $showdiff1 ) {
// TODO: encapsulate somewhere
$page = TranslatablePage::newFromTitle( $group-title );
$rev = $page-getTransRev( $key/$code );
@@ -417,23 +421,76 @@
$oldtext =
$section-getTextForTrans();
}
}
-
foreach (
$page-getParse()-getSectionsForSave() as $section ) {
if ( $group-title-getPrefixedDBKey()
.'/'. $section-id === $key ) {
$newtext =
$section-getTextForTrans();
}
}
+ }
+ else
+ {
+ }
+ } elseif ( $showdiff2 ) {
+ $newtext = $en; // FIXME: this should be sufficient,
but this seems to come from the MessagesEnphp file instead of most recent the
data base record, which is wrong.
+ $en_title = Title::makeTitle( $nsMain, $key . '/en' );
// workaround
+ $revision = Revision::newFromTitle($en_title);
// workaround
+ $newtext = $revision-getText();
// workaround
+ $oldtext = FALSE;
+ // find timestamp of last revision of the current page
before it was fuzzied.
+ $rev = $object-getBaseRevision()-getId();
+ if ( $rev )
+ {
+ $fname = __METHOD__ . ' (' . get_class( $this )
. ')';
+ $dbr = wfGetDB( DB_SLAVE );
+ $pid = $dbr-selectField( 'revision',
'rev_page', array( 'rev_id' = $rev ), $fname );
+ if ( $pid )
+ {
+ $not_fuzzy =
TranslateEditAddons::findLastRevisionByTag( $rev, 'fuzzy', FALSE );
+ if ( $not_fuzzy )
+ {
+ $rev_en = $dbr-selectRow(
+ array ( 'revision',
'page'),
+ 'rev_id',
+ array(
+
'page_namespace' = $nsMain,
+ 'page_title' =
$key . '/en',
+ 'rev_page =
page_id',
+ 'rev_timestamp
'.$not_fuzzy-rev_timestamp
+
[MediaWiki-CVS] SVN: [56466] trunk/extensions/ReaderFeedback/specialpages/RatedPages_body. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56466
Revision: 56466
Author: aaron
Date: 2009-09-17 00:22:04 + (Thu, 17 Sep 2009)
Log Message:
---
fixed message error crappy class name
Modified Paths:
--
trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
Modified: trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
===
--- trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-17 00:13:19 UTC (rev 56465)
+++ trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-17 00:22:04 UTC (rev 56466)
@@ -55,7 +55,7 @@
protected function showPageList() {
global $wgOut;
$tags = ReaderFeedback::getFeedbackTags();
- $pager = new LikedPagesPager( $this, array(), $this-namespace,
$this-tag, $this-tier );
+ $pager = new RatedPagesPager( $this, array(), $this-namespace,
$this-tag, $this-tier );
if( isset($tags[$this-tag]) $pager-getNumRows() ) {
$wgOut-addHTML( wfMsgExt('ratedpages-list',
array('parse') ) );
$wgOut-addHTML( $pager-getNavigationBar() );
@@ -80,7 +80,7 @@
$wgLang-formatNum( $size ) ) .
'/small';
}
$ratinghist = SpecialPage::getTitleFor( 'RatingHistory' );
- $graph = $this-skin-makeKnownLinkObj( $ratinghist,
wfMsg('likedpages-graphs'),
+ $graph = $this-skin-makeKnownLinkObj( $ratinghist,
wfMsg('ratedpages-graphs'),
'target='.$title-getPrefixedUrl() );
return li$link $stxt ($hist) ($graph)/li;
}
@@ -89,7 +89,7 @@
/**
* Query to list out well recieved pages
*/
-class LikedPagesPager extends AlphabeticPager {
+class RatedPagesPager extends AlphabeticPager {
public $mForm, $mConds, $namespace, $tag;
function __construct( $form, $conds = array(), $namespace=0, $tag,
$tier ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56467] branches/wmf-deployment/languages/LanguageConverter.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56467
Revision: 56467
Author: brion
Date: 2009-09-17 00:27:15 + (Thu, 17 Sep 2009)
Log Message:
---
merge r56462 fix from trunk
Modified Paths:
--
branches/wmf-deployment/languages/LanguageConverter.php
Modified: branches/wmf-deployment/languages/LanguageConverter.php
===
--- branches/wmf-deployment/languages/LanguageConverter.php 2009-09-17
00:22:04 UTC (rev 56466)
+++ branches/wmf-deployment/languages/LanguageConverter.php 2009-09-17
00:27:15 UTC (rev 56467)
@@ -566,7 +566,7 @@
function findVariantLink( $link, $nt, $ignoreOtherCond = false ) {
# If the article has already existed, there is no need to
# check it again, otherwise it may cause a fault.
- if ( $nt-exists() )
+ if ( is_object( $nt ) $nt-exists() )
return;
global $wgDisableLangConversion, $wgDisableTitleConversion,
$wgRequest, $wgUser;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56468] trunk/phase3/includes/specials/SpecialContributions.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56468
Revision: 56468
Author: werdna
Date: 2009-09-17 00:32:19 + (Thu, 17 Sep 2009)
Log Message:
---
Fix regression in r52174 where parameter was not passed to
MediaWiki:sp-contributions-footer
Modified Paths:
--
trunk/phase3/includes/specials/SpecialContributions.php
Modified: trunk/phase3/includes/specials/SpecialContributions.php
===
--- trunk/phase3/includes/specials/SpecialContributions.php 2009-09-17
00:27:15 UTC (rev 56467)
+++ trunk/phase3/includes/specials/SpecialContributions.php 2009-09-17
00:32:19 UTC (rev 56468)
@@ -125,7 +125,8 @@
$text = wfMsgNoTrans( $message, $target );
if( !wfEmptyMsg( $message, $text ) $text != '-' ) {
$wgOut-wrapWikiMsg(
- div
class='mw-contributions-footer'\n$1\n/div, $message );
+ div
class='mw-contributions-footer'\n$1\n/div,
+ array( $message, $target ) );
}
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56469] branches/wmf-deployment/includes/specials/SpecialContributions .php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56469
Revision: 56469
Author: werdna
Date: 2009-09-17 00:38:40 + (Thu, 17 Sep 2009)
Log Message:
---
Merge contributions fixes from trunk r56468
Modified Paths:
--
branches/wmf-deployment/includes/specials/SpecialContributions.php
Property Changed:
branches/wmf-deployment/includes/specials/SpecialContributions.php
Modified: branches/wmf-deployment/includes/specials/SpecialContributions.php
===
--- branches/wmf-deployment/includes/specials/SpecialContributions.php
2009-09-17 00:32:19 UTC (rev 56468)
+++ branches/wmf-deployment/includes/specials/SpecialContributions.php
2009-09-17 00:38:40 UTC (rev 56469)
@@ -125,7 +125,8 @@
$text = wfMsgNoTrans( $message, $target );
if( !wfEmptyMsg( $message, $text ) $text != '-' ) {
$wgOut-wrapWikiMsg(
- div
class='mw-contributions-footer'\n$1\n/div, $message );
+ div
class='mw-contributions-footer'\n$1\n/div,
+ array( $message, $target ) );
}
}
}
Property changes on:
branches/wmf-deployment/includes/specials/SpecialContributions.php
___
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/includes/specials/SpecialContributions.php:51646
/branches/wmf-deployment/includes/specials/SpecialContributions.php:53381
/trunk/phase3/includes/specials/SpecialContributions.php:56188,56468
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56470] branches/wmf-deployment/includes/parser/Parser.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56470
Revision: 56470
Author: brion
Date: 2009-09-17 00:51:07 + (Thu, 17 Sep 2009)
Log Message:
---
Revert r53832, r53897, r54145 (bug 17988) Spaces before [[Category:]] links
are no longer ignored and followup
Causes entire page to go blank under some circumstances.
Modified Paths:
--
branches/wmf-deployment/includes/parser/Parser.php
Modified: branches/wmf-deployment/includes/parser/Parser.php
===
--- branches/wmf-deployment/includes/parser/Parser.php 2009-09-17 00:38:40 UTC
(rev 56469)
+++ branches/wmf-deployment/includes/parser/Parser.php 2009-09-17 00:51:07 UTC
(rev 56470)
@@ -1726,7 +1726,7 @@
if ( $ns == NS_CATEGORY ) {
wfProfileIn( __METHOD__.-category );
- $s = preg_replace( /(\s*\n)+\s*$/D,
'', $s ); # bug 87
+ $s = rtrim($s . \n); # bug 87
if ( $wasblank ) {
$sortkey =
$this-getDefaultSort();
@@ -1742,7 +1742,7 @@
* Strip the whitespace Category links
produce, see bug 87
* @todo We might want to use
trim($tmp, \n) here.
*/
- $s .= trim( $prefix . $trail, \n ) ==
'' ? '' : $prefix . $trail;
+ $s .= trim($prefix . $trail, \n) ==
'' ? '': $prefix . $trail;
wfProfileOut( __METHOD__.-category );
continue;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56471] trunk/phase3/includes/User.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56471
Revision: 56471
Author: werdna
Date: 2009-09-17 00:56:27 + (Thu, 17 Sep 2009)
Log Message:
---
Fix bug where checking another user's blocked status (like for contributions)
would cause you to be autoblocked if that user was blocked. Regression in r56325
Modified Paths:
--
trunk/phase3/includes/User.php
Modified: trunk/phase3/includes/User.php
===
--- trunk/phase3/includes/User.php 2009-09-17 00:51:07 UTC (rev 56470)
+++ trunk/phase3/includes/User.php 2009-09-17 00:56:27 UTC (rev 56471)
@@ -1118,7 +1118,7 @@
$this-mBlockreason = $this-mBlock-mReason;
$this-mHideName = $this-mBlock-mHideName;
$this-mAllowUsertalk = $this-mBlock-mAllowUsertalk;
- if ( $this-isLoggedIn() ) {
+ if ( $this-isLoggedIn() $wgUser-getID() ==
$this-getID() ) {
$this-spreadBlock();
}
} else {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56472] trunk/phase3/includes/parser/Parser.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56472
Revision: 56472
Author: brion
Date: 2009-09-17 00:57:10 + (Thu, 17 Sep 2009)
Log Message:
---
Revert r53832, r53897, r54145 (bug 17988) Spaces before [[Category:]] links
are no longer ignored and followup
Causes entire page to go blank under some circumstances.
Modified Paths:
--
trunk/phase3/includes/parser/Parser.php
Modified: trunk/phase3/includes/parser/Parser.php
===
--- trunk/phase3/includes/parser/Parser.php 2009-09-17 00:56:27 UTC (rev
56471)
+++ trunk/phase3/includes/parser/Parser.php 2009-09-17 00:57:10 UTC (rev
56472)
@@ -1726,7 +1726,7 @@
if ( $ns == NS_CATEGORY ) {
wfProfileIn( __METHOD__.-category );
- $s = preg_replace( /(\s*\n)+\s*$/D,
'', $s ); # bug 87
+ $s = rtrim($s . \n); # bug 87
if ( $wasblank ) {
$sortkey =
$this-getDefaultSort();
@@ -1742,7 +1742,7 @@
* Strip the whitespace Category links
produce, see bug 87
* @todo We might want to use
trim($tmp, \n) here.
*/
- $s .= trim( $prefix . $trail, \n ) ==
'' ? '' : $prefix . $trail;
+ $s .= trim($prefix . $trail, \n) ==
'' ? '': $prefix . $trail;
wfProfileOut( __METHOD__.-category );
continue;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56473] branches/wmf-deployment
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56473
Revision: 56473
Author: werdna
Date: 2009-09-17 00:57:17 + (Thu, 17 Sep 2009)
Log Message:
---
Merge autoblock bug fix r56471
Modified Paths:
--
branches/wmf-deployment/extensions/LiquidThreads/classes/Hooks.php
branches/wmf-deployment/includes/User.php
Modified: branches/wmf-deployment/extensions/LiquidThreads/classes/Hooks.php
===
--- branches/wmf-deployment/extensions/LiquidThreads/classes/Hooks.php
2009-09-17 00:57:10 UTC (rev 56472)
+++ branches/wmf-deployment/extensions/LiquidThreads/classes/Hooks.php
2009-09-17 00:57:17 UTC (rev 56473)
@@ -3,7 +3,7 @@
class LqtHooks {
static function onPageMove( $movepage, $ot, $nt ) {
// Shortcut for non-LQT pages.
- if ( !self::isLqtPage( $ot ) )
+ if ( !LqtDispatch::isLqtPage( $ot ) )
return true;
// Move the threads on that page to the new page.
@@ -168,6 +168,22 @@
'section' = 'watchlist/advancedwatchlist',
);
+ // Display depth and count
+ $preferences['lqtdisplaydepth'] =
+ array(
+ 'type' = 'int',
+ 'label-message' =
'lqt-preference-display-depth',
+ 'section' = 'lqt',
+ );
+
+ // Display depth and count
+ $preferences['lqtdisplaycount'] =
+ array(
+ 'type' = 'int',
+ 'label-message' =
'lqt-preference-display-count',
+ 'section' = 'lqt',
+ );
+
return true;
}
@@ -292,7 +308,7 @@
global $wgExtNewTables, $wgExtNewFields, $wgExtPGNewFields,
$wgExtPGAlteredFields, $wgExtNewIndexes,
$wgDBtype;
- $dir = dirname( __FILE__ );
+ $dir = realpath( dirname( __FILE__ ) . '/..' );
// DB updates
$wgExtNewTables[] = array( 'thread', $dir/lqt.sql );
@@ -300,16 +316,16 @@
$wgExtNewTables[] = array( 'thread_history',
$dir/schema-changes/thread_history_table.sql );
- $wgExtNewFields[] = array( thread,
thread_article_namespace, $dir/split-thread_article.sql );
- $wgExtNewFields[] = array( thread, thread_article_title,
$dir/split-thread_article.sql );
- $wgExtNewFields[] = array( thread, thread_ancestor,
$dir/normalise-ancestry.sql );
- $wgExtNewFields[] = array( thread, thread_parent,
$dir/normalise-ancestry.sql );
- $wgExtNewFields[] = array( thread, thread_modified,
$dir/split-timestamps.sql );
- $wgExtNewFields[] = array( thread, thread_created,
$dir/split-timestamps.sql );
- $wgExtNewFields[] = array( thread, thread_editedness,
$dir/store-editedness.sql );
- $wgExtNewFields[] = array( thread, thread_subject,
$dir/store_subject-author.sql );
- $wgExtNewFields[] = array( thread, thread_author_id,
$dir/store_subject-author.sql );
- $wgExtNewFields[] = array( thread, thread_author_name,
$dir/store_subject-author.sql );
+ $wgExtNewFields[] = array( thread,
thread_article_namespace, $dir/schema-changes/split-thread_article.sql );
+ $wgExtNewFields[] = array( thread, thread_article_title,
$dir/schema-changes/split-thread_article.sql );
+ $wgExtNewFields[] = array( thread, thread_ancestor,
$dir/schema-changes/normalise-ancestry.sql );
+ $wgExtNewFields[] = array( thread, thread_parent,
$dir/schema-changes/normalise-ancestry.sql );
+ $wgExtNewFields[] = array( thread, thread_modified,
$dir/schema-changes/split-timestamps.sql );
+ $wgExtNewFields[] = array( thread, thread_created,
$dir/schema-changes/split-timestamps.sql );
+ $wgExtNewFields[] = array( thread, thread_editedness,
$dir/schema-changes/store-editedness.sql );
+ $wgExtNewFields[] = array( thread, thread_subject,
$dir/schema-changes/store_subject-author.sql );
+ $wgExtNewFields[] = array( thread, thread_author_id,
$dir/schema-changes/store_subject-author.sql );
+ $wgExtNewFields[] = array( thread, thread_author_name,
$dir/schema-changes/store_subject-author.sql );
$wgExtNewIndexes[] = array( 'thread', 'thread_summary_page',
'(thread_summary_page)' );
Modified: branches/wmf-deployment/includes/User.php
===
[MediaWiki-CVS] SVN: [56474] trunk/phase3/includes/api/ApiUpload.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56474
Revision: 56474
Author: mrzman
Date: 2009-09-17 01:03:52 + (Thu, 17 Sep 2009)
Log Message:
---
Actually use the filename supplied by the user.
Modified Paths:
--
trunk/phase3/includes/api/ApiUpload.php
Modified: trunk/phase3/includes/api/ApiUpload.php
===
--- trunk/phase3/includes/api/ApiUpload.php 2009-09-17 00:57:17 UTC (rev
56473)
+++ trunk/phase3/includes/api/ApiUpload.php 2009-09-17 01:03:52 UTC (rev
56474)
@@ -129,7 +129,7 @@
if ( isset( $this-mParams['file'] ) ) {
$this-mUpload = new UploadFromFile();
$this-mUpload-initialize(
- $request-getFileName( 'file' ),
+ $this-mParams['filename'],
$request-getFileTempName( 'file' ),
$request-getFileSize( 'file' )
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56475] trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56475
Revision: 56475
Author: aaron
Date: 2009-09-17 01:03:52 + (Thu, 17 Sep 2009)
Log Message:
---
Check crapy change_tag index variable
Modified Paths:
--
trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
Modified: trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===
--- trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:03:52 UTC (rev 56474)
+++ trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:03:52 UTC (rev 56475)
@@ -288,7 +288,8 @@
}
function getQueryInfo() {
- global $wgUser;
+ global $wgUser, $wgOldChangeTagsIndex;
+ $ctIndex = $wgOldChangeTagsIndex ? 'ct_tag' :
'change_tag_rev_tag';
$conds = $this-mConds;
$tables = array( 'page', 'revision', 'change_tag' );
$fields = array('page_namespace','page_title','page_latest');
@@ -305,7 +306,7 @@
$conds[] = 'ct_rev_id = rev_id';
$conds['ct_tag'] = $this-tag;
$useIndex = array('flaggedpages' = 'fp_pending_since',
- 'change_tag' = 'change_tag_rev_tag ');
+ 'change_tag' = $ctIndex);
# Filter by category
if( $this-category ) {
array_unshift($tables,'categorylinks'); //
order matters
@@ -329,7 +330,7 @@
$conds[] = 'rev_id = ct_rev_id';
$conds['ct_tag'] = $this-tag;
$useIndex = array('flaggedpage_pending' =
'fpp_quality_pending',
- 'change_tag' = 'change_tag_rev_tag ');
+ 'change_tag' = $ctIndex);
# Filter by review level
$conds['fpp_quality'] = $this-level;
# Filter by category
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56476] branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ ProblemChanges_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56476
Revision: 56476
Author: brion
Date: 2009-09-17 01:07:10 + (Thu, 17 Sep 2009)
Log Message:
---
merge r56475
Modified Paths:
--
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
Modified:
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===
---
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:03:52 UTC (rev 56475)
+++
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:07:10 UTC (rev 56476)
@@ -288,7 +288,8 @@
}
function getQueryInfo() {
- global $wgUser;
+ global $wgUser, $wgOldChangeTagsIndex;
+ $ctIndex = $wgOldChangeTagsIndex ? 'ct_tag' :
'change_tag_rev_tag';
$conds = $this-mConds;
$tables = array( 'page', 'revision', 'change_tag' );
$fields = array('page_namespace','page_title','page_latest');
@@ -305,7 +306,7 @@
$conds[] = 'ct_rev_id = rev_id';
$conds['ct_tag'] = $this-tag;
$useIndex = array('flaggedpages' = 'fp_pending_since',
- 'change_tag' = 'change_tag_rev_tag ');
+ 'change_tag' = $ctIndex);
# Filter by category
if( $this-category ) {
array_unshift($tables,'categorylinks'); //
order matters
@@ -329,7 +330,7 @@
$conds[] = 'rev_id = ct_rev_id';
$conds['ct_tag'] = $this-tag;
$useIndex = array('flaggedpage_pending' =
'fpp_quality_pending',
- 'change_tag' = 'change_tag_rev_tag ');
+ 'change_tag' = $ctIndex);
# Filter by review level
$conds['fpp_quality'] = $this-level;
# Filter by category
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56477] branches/wmf-deployment/includes/Linker.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56477
Revision: 56477
Author: brion
Date: 2009-09-17 01:09:45 + (Thu, 17 Sep 2009)
Log Message:
---
array() - '' for string return
Modified Paths:
--
branches/wmf-deployment/includes/Linker.php
Modified: branches/wmf-deployment/includes/Linker.php
===
--- branches/wmf-deployment/includes/Linker.php 2009-09-17 01:07:10 UTC (rev
56476)
+++ branches/wmf-deployment/includes/Linker.php 2009-09-17 01:09:45 UTC (rev
56477)
@@ -1964,7 +1964,7 @@
public function tooltip( $name, $options = null ) {
global $wgEnableTooltipsAndAccesskeys;
if ($wgEnableTooltipsAndAccesskeys)
- return array();
+ return '';
# FIXME: If Sanitizer::expandAttributes() treated false as
output
# no attribute instead of output '' as value for attribute,
this
# would be two lines.
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56478] trunk/phase3/includes/EditPage.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56478
Revision: 56478
Author: aaron
Date: 2009-09-17 01:14:00 + (Thu, 17 Sep 2009)
Log Message:
---
partial revert on r55573; livePreview() is still used
Modified Paths:
--
trunk/phase3/includes/EditPage.php
Modified: trunk/phase3/includes/EditPage.php
===
--- trunk/phase3/includes/EditPage.php 2009-09-17 01:09:45 UTC (rev 56477)
+++ trunk/phase3/includes/EditPage.php 2009-09-17 01:14:00 UTC (rev 56478)
@@ -2338,7 +2338,37 @@
return $buttons;
}
+ /**
+* Output preview text only. This can be sucked into the edit page
+* via JavaScript, and saves the server time rendering the skin as
+* well as theoretically being more robust on the client (doesn't
+* disturb the edit box's undo history, won't eat your text on
+* failure, etc).
+*
+* @todo This doesn't include category or interlanguage links.
+* Would need to enhance it a bit, smaybe wrap them in XML
+* or something.../s that might also require more skin
+* initialization, so check whether that's a problem.
+*/
+ function livePreview() {
+ global $wgOut;
+ $wgOut-disable();
+ header( 'Content-type: text/xml; charset=utf-8' );
+ header( 'Cache-control: no-cache' );
+ $previewText = $this-getPreviewText();
+ #$categories = $skin-getCategoryLinks();
+
+ $s =
+ '?xml version=1.0 encoding=UTF-8 ?' . \n .
+ Xml::tags( 'livepreview', null,
+ Xml::element( 'preview', null, $previewText )
+ #. Xml::element( 'category', null, $categories )
+ );
+ echo $s;
+ }
+
+
/**
* Get a diff between the current contents of the edit box and the
* version of the page we're editing from.
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56479] trunk/phase3
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56479
Revision: 56479
Author: dale
Date: 2009-09-17 01:19:02 + (Thu, 17 Sep 2009)
Log Message:
---
* Enhanced OutputPage to support js2 style javascript without scriptloader
enabled
** loadGM output
** unique request id based on wikiTitle revision / file time
* Moved jsAutoLoadClasses to setup.php ( made conditional )
Modified Paths:
--
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/OutputPage.php
trunk/phase3/includes/Setup.php
trunk/phase3/includes/json/FormatJson.php
trunk/phase3/js2/mwEmbed/jsScriptLoader.php
Modified: trunk/phase3/includes/AutoLoader.php
===
--- trunk/phase3/includes/AutoLoader.php2009-09-17 01:14:00 UTC (rev
56478)
+++ trunk/phase3/includes/AutoLoader.php2009-09-17 01:19:02 UTC (rev
56479)
@@ -623,11 +623,6 @@
'ajaxCategories' = 'js2/ajaxcategories.js',
);
-//Include the js2 autoLoadClasses
-//@@todo move jsAutoloadLocalClasses.php to post Setup so we have default
values and can check the $wgEnableJS2system var
-$wgMwEmbedDirectory = js2/mwEmbed/;
-require_once($IP/js2/mwEmbed/php/jsAutoloadLocalClasses.php);
-
class AutoLoader {
/**
* autoload - take a class name and attempt to load it
Modified: trunk/phase3/includes/OutputPage.php
===
--- trunk/phase3/includes/OutputPage.php2009-09-17 01:14:00 UTC (rev
56478)
+++ trunk/phase3/includes/OutputPage.php2009-09-17 01:19:02 UTC (rev
56479)
@@ -16,10 +16,9 @@
var $mScriptLoaderClassList = array();
- // The most recent revision ID of any wikiPage script that is grouped
in the script request
- var $mLatestScriptRevID = 0;
+ var $mScripts = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems =
array();
+ var $mInlineMsg = array();
- var $mScripts = '', $mLinkColours, $mPageLinkTitle = '', $mHeadItems =
array();
var $mTemplateIds = array();
var $mAllowUserJs;
@@ -119,7 +118,7 @@
*/
function addScriptFile( $file ) {
global $wgStylePath, $wgScript, $wgUser;
- global $wgJSAutoloadClasses, $wgJSAutoloadLocalClasses,
$wgEnableScriptLoader, $wgScriptPath;
+ global $wgEnableScriptLoader, $wgScriptPath;
if( substr( $file, 0, 1 ) == '/' ) {
$path = $file;
@@ -127,42 +126,41 @@
$path = {$wgStylePath}/common/{$file};
}
- if( $wgEnableScriptLoader ) {
- if( strpos( $path, $wgScript ) !== false ) {
- $reqPath = str_replace( $wgScript . '?', '',
$path );
- $reqArgs = explode( '', $reqPath );
- $reqSet = array();
+ // If the class can be determined, use the addScriptClass method
+ $js_class = $this-getJsClassFromPath( $path );
+ if( $js_class ) {
+ $this-addScriptClass( $js_class );
+ return true;
+ }
- foreach( $reqArgs as $arg ) {
- list( $key, $var ) = explode( '=', $arg
);
- $reqSet[$key] = $var;
- }
+ //do checks for wiki-titles
+ if( strpos( $path, $wgScript ) !== false ) {
+ $reqPath = str_replace( $wgScript . '?', '', $path );
+ $reqArgs = explode( '', $reqPath );
+ $reqSet = array();
- if( isset( $reqSet['title'] ) $reqSet != ''
) {
+ foreach( $reqArgs as $arg ) {
+ list( $key, $var ) = explode( '=', $arg );
+ $reqSet[$key] = $var;
+ }
+
+ if( isset( $reqSet['title'] ) $reqSet != '' ) {
+ $jsTitleClass = 'WT:' . $reqSet['title'];
+ if( $wgEnableScriptLoader ) {
// Extract any extra parameters (for
now just skin)
$ext_param = ( isset(
$reqSet['useskin'] ) $reqSet['useskin'] != '' )
? '|useskin=' . ucfirst(
$reqSet['useskin'] ) : '';
- $this-mScriptLoaderClassList[] = 'WT:'
. $reqSet['title'] . $ext_param ;
- // Add the title revision to the key.
- // If there is no title, we will just
use $wgStyleVersion,
- // which should be updated on the
relevant commits.
-
[MediaWiki-CVS] SVN: [56480] branches/wmf-deployment/includes/api/ApiUpload.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56480
Revision: 56480
Author: brion
Date: 2009-09-17 01:20:05 + (Thu, 17 Sep 2009)
Log Message:
---
Merge r56474 fix for api upload filename
Modified Paths:
--
branches/wmf-deployment/includes/api/ApiUpload.php
Modified: branches/wmf-deployment/includes/api/ApiUpload.php
===
--- branches/wmf-deployment/includes/api/ApiUpload.php 2009-09-17 01:19:02 UTC
(rev 56479)
+++ branches/wmf-deployment/includes/api/ApiUpload.php 2009-09-17 01:20:05 UTC
(rev 56480)
@@ -129,7 +129,7 @@
if ( isset( $this-mParams['file'] ) ) {
$this-mUpload = new UploadFromFile();
$this-mUpload-initialize(
- $request-getFileName( 'file' ),
+ $this-mParams['filename'],
$request-getFileTempName( 'file' ),
$request-getFileSize( 'file' )
);
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56481] trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56481
Revision: 56481
Author: aaron
Date: 2009-09-17 01:20:10 + (Thu, 17 Sep 2009)
Log Message:
---
I was given wrong info, old name was ct_rev_id
Modified Paths:
--
trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
Modified: trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===
--- trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:20:05 UTC (rev 56480)
+++ trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:20:10 UTC (rev 56481)
@@ -289,7 +289,7 @@
function getQueryInfo() {
global $wgUser, $wgOldChangeTagsIndex;
- $ctIndex = $wgOldChangeTagsIndex ? 'ct_tag' :
'change_tag_rev_tag';
+ $ctIndex = $wgOldChangeTagsIndex ? 'ct_rev_id' :
'change_tag_rev_tag';
$conds = $this-mConds;
$tables = array( 'page', 'revision', 'change_tag' );
$fields = array('page_namespace','page_title','page_latest');
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56482] branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ ProblemChanges_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56482
Revision: 56482
Author: aaron
Date: 2009-09-17 01:23:06 + (Thu, 17 Sep 2009)
Log Message:
---
Merged r56481
Modified Paths:
--
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
Modified:
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===
---
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:20:10 UTC (rev 56481)
+++
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:23:06 UTC (rev 56482)
@@ -289,7 +289,7 @@
function getQueryInfo() {
global $wgUser, $wgOldChangeTagsIndex;
- $ctIndex = $wgOldChangeTagsIndex ? 'ct_tag' :
'change_tag_rev_tag';
+ $ctIndex = $wgOldChangeTagsIndex ? 'ct_rev_id' :
'change_tag_rev_tag';
$conds = $this-mConds;
$tables = array( 'page', 'revision', 'change_tag' );
$fields = array('page_namespace','page_title','page_latest');
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56483] trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56483
Revision: 56483
Author: aaron
Date: 2009-09-17 01:45:34 + (Thu, 17 Sep 2009)
Log Message:
---
query optimization
Modified Paths:
--
trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
Modified: trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===
--- trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:23:06 UTC (rev 56482)
+++ trunk/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:45:34 UTC (rev 56483)
@@ -291,7 +291,7 @@
global $wgUser, $wgOldChangeTagsIndex;
$ctIndex = $wgOldChangeTagsIndex ? 'ct_rev_id' :
'change_tag_rev_tag';
$conds = $this-mConds;
- $tables = array( 'page', 'revision', 'change_tag' );
+ $tables = array( 'revision', 'change_tag', 'page' );
$fields = array('page_namespace','page_title','page_latest');
# Show outdated stable versions
if( $this-level 0 ) {
@@ -301,7 +301,7 @@
$conds[] = 'fp_pending_since IS NOT NULL';
$conds[] = 'page_id = fp_page_id';
# Find revisions that are tagged as such
- $conds[] = 'rev_page = page_id';
+ $conds[] = 'rev_page = fp_page_id';
$conds[] = 'rev_id fp_stable';
$conds[] = 'ct_rev_id = rev_id';
$conds['ct_tag'] = $this-tag;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56484] branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ ProblemChanges_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56484
Revision: 56484
Author: aaron
Date: 2009-09-17 01:46:22 + (Thu, 17 Sep 2009)
Log Message:
---
merged r56483
Modified Paths:
--
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
Modified:
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
===
---
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:45:34 UTC (rev 56483)
+++
branches/wmf-deployment/extensions/FlaggedRevs/specialpages/ProblemChanges_body.php
2009-09-17 01:46:22 UTC (rev 56484)
@@ -291,7 +291,7 @@
global $wgUser, $wgOldChangeTagsIndex;
$ctIndex = $wgOldChangeTagsIndex ? 'ct_rev_id' :
'change_tag_rev_tag';
$conds = $this-mConds;
- $tables = array( 'page', 'revision', 'change_tag' );
+ $tables = array( 'revision', 'change_tag', 'page' );
$fields = array('page_namespace','page_title','page_latest');
# Show outdated stable versions
if( $this-level 0 ) {
@@ -301,7 +301,7 @@
$conds[] = 'fp_pending_since IS NOT NULL';
$conds[] = 'page_id = fp_page_id';
# Find revisions that are tagged as such
- $conds[] = 'rev_page = page_id';
+ $conds[] = 'rev_page = fp_page_id';
$conds[] = 'rev_id fp_stable';
$conds[] = 'ct_rev_id = rev_id';
$conds['ct_tag'] = $this-tag;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56485] branches/wmf-deployment/extensions/ReaderFeedback/specialpages /RatedPages_body.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56485
Revision: 56485
Author: aaron
Date: 2009-09-17 01:54:06 + (Thu, 17 Sep 2009)
Log Message:
---
merged r56466
Modified Paths:
--
branches/wmf-deployment/extensions/ReaderFeedback/specialpages/RatedPages_body.php
Modified:
branches/wmf-deployment/extensions/ReaderFeedback/specialpages/RatedPages_body.php
===
---
branches/wmf-deployment/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-17 01:46:22 UTC (rev 56484)
+++
branches/wmf-deployment/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-17 01:54:06 UTC (rev 56485)
@@ -55,7 +55,7 @@
protected function showPageList() {
global $wgOut;
$tags = ReaderFeedback::getFeedbackTags();
- $pager = new LikedPagesPager( $this, array(), $this-namespace,
$this-tag, $this-tier );
+ $pager = new RatedPagesPager( $this, array(), $this-namespace,
$this-tag, $this-tier );
if( isset($tags[$this-tag]) $pager-getNumRows() ) {
$wgOut-addHTML( wfMsgExt('ratedpages-list',
array('parse') ) );
$wgOut-addHTML( $pager-getNavigationBar() );
@@ -80,7 +80,7 @@
$wgLang-formatNum( $size ) ) .
'/small';
}
$ratinghist = SpecialPage::getTitleFor( 'RatingHistory' );
- $graph = $this-skin-makeKnownLinkObj( $ratinghist,
wfMsg('likedpages-graphs'),
+ $graph = $this-skin-makeKnownLinkObj( $ratinghist,
wfMsg('ratedpages-graphs'),
'target='.$title-getPrefixedUrl() );
return li$link $stxt ($hist) ($graph)/li;
}
@@ -89,7 +89,7 @@
/**
* Query to list out well recieved pages
*/
-class LikedPagesPager extends AlphabeticPager {
+class RatedPagesPager extends AlphabeticPager {
public $mForm, $mConds, $namespace, $tag;
function __construct( $form, $conds = array(), $namespace=0, $tag,
$tier ) {
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56486] trunk/phase3/includes/templates/Userlogin.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56486
Revision: 56486
Author: aaron
Date: 2009-09-17 02:15:51 + (Thu, 17 Sep 2009)
Log Message:
---
partial revert of r55447: breaks url wpName prefilling
Modified Paths:
--
trunk/phase3/includes/templates/Userlogin.php
Modified: trunk/phase3/includes/templates/Userlogin.php
===
--- trunk/phase3/includes/templates/Userlogin.php 2009-09-17 01:54:06 UTC
(rev 56485)
+++ trunk/phase3/includes/templates/Userlogin.php 2009-09-17 02:15:51 UTC
(rev 56486)
@@ -156,7 +156,7 @@
td class=mw-labellabel for='wpName2'?php
$this-msg('yourname') ?/label/td
td class=mw-input
?php
- echo Html::input( 'wpName', null, 'text', array(
+ echo Html::input( 'wpName', $this-data['name'],
'text', array(
'class' = 'loginText',
'id' = 'wpName2',
'tabindex' = '1',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56487] branches/wmf-deployment/includes/templates/Userlogin.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56487
Revision: 56487
Author: aaron
Date: 2009-09-17 02:17:21 + (Thu, 17 Sep 2009)
Log Message:
---
merged r56486: partial revert of r55447: breaks url wpName prefilling
Modified Paths:
--
branches/wmf-deployment/includes/templates/Userlogin.php
Modified: branches/wmf-deployment/includes/templates/Userlogin.php
===
--- branches/wmf-deployment/includes/templates/Userlogin.php2009-09-17
02:15:51 UTC (rev 56486)
+++ branches/wmf-deployment/includes/templates/Userlogin.php2009-09-17
02:17:21 UTC (rev 56487)
@@ -156,7 +156,7 @@
td class=mw-labellabel for='wpName2'?php
$this-msg('yourname') ?/label/td
td class=mw-input
?php
- echo Html::input( 'wpName', null, 'text', array(
+ echo Html::input( 'wpName', $this-data['name'],
'text', array(
'class' = 'loginText',
'id' = 'wpName2',
'tabindex' = '1',
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56488] trunk/phase3/includes/specials/SpecialUserrights.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56488
Revision: 56488
Author: aaron
Date: 2009-09-17 02:24:38 + (Thu, 17 Sep 2009)
Log Message:
---
Actually declare $wgOut ;)
Modified Paths:
--
trunk/phase3/includes/specials/SpecialUserrights.php
Modified: trunk/phase3/includes/specials/SpecialUserrights.php
===
--- trunk/phase3/includes/specials/SpecialUserrights.php2009-09-17
02:17:21 UTC (rev 56487)
+++ trunk/phase3/includes/specials/SpecialUserrights.php2009-09-17
02:24:38 UTC (rev 56488)
@@ -47,7 +47,7 @@
public function execute( $par ) {
// If the visitor doesn't have permissions to assign or remove
// any groups, it's a bit silly to give them the user search
prompt.
- global $wgUser, $wgRequest;
+ global $wgUser, $wgRequest, $wgOut;
if( $par ) {
$this-mTarget = $par;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56489] branches/wmf-deployment/includes/specials/SpecialUserrights. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56489
Revision: 56489
Author: aaron
Date: 2009-09-17 02:25:26 + (Thu, 17 Sep 2009)
Log Message:
---
Merged r56488: declare $wgOut to avoid fatal
Modified Paths:
--
branches/wmf-deployment/includes/specials/SpecialUserrights.php
Modified: branches/wmf-deployment/includes/specials/SpecialUserrights.php
===
--- branches/wmf-deployment/includes/specials/SpecialUserrights.php
2009-09-17 02:24:38 UTC (rev 56488)
+++ branches/wmf-deployment/includes/specials/SpecialUserrights.php
2009-09-17 02:25:26 UTC (rev 56489)
@@ -47,7 +47,7 @@
public function execute( $par ) {
// If the visitor doesn't have permissions to assign or remove
// any groups, it's a bit silly to give them the user search
prompt.
- global $wgUser, $wgRequest;
+ global $wgUser, $wgRequest, $wgOut;
if( $par ) {
$this-mTarget = $par;
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56490] trunk/extensions/ReaderFeedback/specialpages/RatedPages_body. php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56490
Revision: 56490
Author: aaron
Date: 2009-09-17 02:58:31 + (Thu, 17 Sep 2009)
Log Message:
---
Make graph links default from 1-3 month range
Modified Paths:
--
trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
Modified: trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
===
--- trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-17 02:25:26 UTC (rev 56489)
+++ trunk/extensions/ReaderFeedback/specialpages/RatedPages_body.php
2009-09-17 02:58:31 UTC (rev 56490)
@@ -81,7 +81,7 @@
}
$ratinghist = SpecialPage::getTitleFor( 'RatingHistory' );
$graph = $this-skin-makeKnownLinkObj( $ratinghist,
wfMsg('ratedpages-graphs'),
- 'target='.$title-getPrefixedUrl() );
+ 'target='.$title-getPrefixedUrl().'period=93' );
return li$link $stxt ($hist) ($graph)/li;
}
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56491] trunk/phase3/languages/LanguageConverter.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56491
Revision: 56491
Author: philip
Date: 2009-09-17 04:16:17 + (Thu, 17 Sep 2009)
Log Message:
---
Follow up on r53041. Fix a __NOCC__ failure caused by myself and I'm stupid to
report it on #Wikimedia-tech!
Modified Paths:
--
trunk/phase3/languages/LanguageConverter.php
Modified: trunk/phase3/languages/LanguageConverter.php
===
--- trunk/phase3/languages/LanguageConverter.php2009-09-17 02:58:31 UTC
(rev 56490)
+++ trunk/phase3/languages/LanguageConverter.php2009-09-17 04:16:17 UTC
(rev 56491)
@@ -532,6 +532,8 @@
if( $this-mDoContentConvert )
// Bug 19620: should convert a string
immediately after a new rule added.
$text .= $this-autoConvert( $marked[0], $plang
);
+ else
+ $text .= $marked[0];
if ( array_key_exists( 1, $marked ) ) {
$crule = new ConverterRule($marked[1], $this);
@@ -546,7 +548,6 @@
// Remove the last delimiter (wasn't real)
$text = substr( $text, 0, -strlen( $this-mMarkup['end'] ) );
-
return $text;
}
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
[MediaWiki-CVS] SVN: [56492] trunk/phase3/includes/Title.php
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/56492
Revision: 56492
Author: mrzman
Date: 2009-09-17 04:27:02 + (Thu, 17 Sep 2009)
Log Message:
---
Fix logic error from r54153. By negating each individual isAllowed check, the
OR statement would return true
(and not allow the action) if the user didn't have both rights rather than
checking if he has either one.
Modified Paths:
--
trunk/phase3/includes/Title.php
Modified: trunk/phase3/includes/Title.php
===
--- trunk/phase3/includes/Title.php 2009-09-17 04:16:17 UTC (rev 56491)
+++ trunk/phase3/includes/Title.php 2009-09-17 04:27:02 UTC (rev 56492)
@@ -1290,12 +1290,12 @@
# XXX: Find a way to work around the php bug that prevents
using $this-userCanEditCssSubpage()
# and $this-userCanEditJsSubpage() from working
# XXX: right 'editusercssjs' is deprecated, for backward
compatibility only
- if( $this-isCssSubpage() (
!$user-isAllowed('editusercssjs') || !$user-isAllowed('editusercss') )
+ if( $this-isCssSubpage() !(
$user-isAllowed('editusercssjs') || $user-isAllowed('editusercss') )
$action != 'patrol'
!preg_match('/^'.preg_quote($user-getName(),
'/').'\//', $this-mTextform) )
{
$errors[] = array('customcssjsprotected');
- } else if( $this-isJsSubpage() (
!$user-isAllowed('editusercssjs') || !$user-isAllowed('edituserjs') )
+ } else if( $this-isJsSubpage() !(
$user-isAllowed('editusercssjs') || $user-isAllowed('edituserjs') )
$action != 'patrol'
!preg_match('/^'.preg_quote($user-getName(),
'/').'\//', $this-mTextform) )
{
___
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
