reedy | 1 Nov 2010 01:03
Picon
Favicon

SVN: [75766] trunk/phase3/includes/specials/SpecialIpblocklist.php

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75766

Revision: 75766
Author:   reedy
Date:     2010-11-01 00:03:09 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Fixup undefined $this->id

Fix assignment in conditional

Modified Paths:
--------------
    trunk/phase3/includes/specials/SpecialIpblocklist.php

Modified: trunk/phase3/includes/specials/SpecialIpblocklist.php
===================================================================
--- trunk/phase3/includes/specials/SpecialIpblocklist.php	2010-10-31 23:54:30 UTC (rev 75765)
+++ trunk/phase3/includes/specials/SpecialIpblocklist.php	2010-11-01 00:03:09 UTC (rev 75766)
 <at>  <at>  -71,10 +71,10  <at>  <at> 
 	
 			# bug 15810: blocked admins should have limited access here
 			if ( $wgUser->isBlocked() ) {
-				if ( $id ) {
+				if ( $this->id ) {
 					# This doesn't pick up on autoblocks, but admins
 					# should have the ipblock-exempt permission anyway
-					$block = Block::newFromID( $id );
+					$block = Block::newFromID( $this->id );
 					$user = User::newFromName( $block->mAddress );
(Continue reading)

reedy | 1 Nov 2010 01:10
Picon
Favicon

SVN: [75768] trunk/phase3/includes

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75768

Revision: 75768
Author:   reedy
Date:     2010-11-01 00:10:00 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Fix minor semi colon fail from r75767

Modified Paths:
--------------
    trunk/phase3/includes/Title.php
    trunk/phase3/includes/filerepo/File.php
    trunk/phase3/includes/normal/UtfNormal.php

Modified: trunk/phase3/includes/Title.php
===================================================================
--- trunk/phase3/includes/Title.php	2010-11-01 00:07:17 UTC (rev 75767)
+++ trunk/phase3/includes/Title.php	2010-11-01 00:10:00 UTC (rev 75768)
 <at>  <at>  -2794,7 +2794,7  <at>  <at> 
 		$retVal = array();
 		if ( $db->numRows( $res ) ) {
 			foreach ( $res as $row ) {
-				$titleObj = Title::makeTitle( $row->page_namespace, $row->page_title )
+				$titleObj = Title::makeTitle( $row->page_namespace, $row->page_title );
 				if ( $titleObj ) {
 					$linkCache->addGoodLinkObj( $row->page_id, $titleObj, $row->page_len,
$row->page_is_redirect, $row->page_latest );
 					$retVal[] = $titleObj;

(Continue reading)

hartman | 1 Nov 2010 01:14
Picon
Favicon

SVN: [75769] trunk/phase3

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75769

Revision: 75769
Author:   hartman
Date:     2010-11-01 00:14:21 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
Avoid unnecessary linebreaks in difflines. Fixes bug 25725

Modified Paths:
--------------
    trunk/phase3/RELEASE-NOTES
    trunk/phase3/includes/diff/DifferenceEngine.php

Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES	2010-11-01 00:10:00 UTC (rev 75768)
+++ trunk/phase3/RELEASE-NOTES	2010-11-01 00:14:21 UTC (rev 75769)
 <at>  <at>  -380,6 +380,7  <at>  <at> 
 * (bug 25642) A exception is now thrown instead of a fatal error when using
   $wgSMTP without PEAR mail package
 * (bug 19633) When possible, Upscale small SVGs when creating thumbnails.
+* (bug 25725) Unwanted linebreaks in diffs.

 === API changes in 1.17 ===
 * (bug 22738) Allow filtering by action type on query=logevent.

Modified: trunk/phase3/includes/diff/DifferenceEngine.php
===================================================================
--- trunk/phase3/includes/diff/DifferenceEngine.php	2010-11-01 00:10:00 UTC (rev 75768)
(Continue reading)

reedy | 1 Nov 2010 01:07
Picon
Favicon

SVN: [75767] trunk/phase3

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75767

Revision: 75767
Author:   reedy
Date:     2010-11-01 00:07:17 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
bug 25517 Assignment in conditions should be avoided/ http://www.mediawiki.org/wiki/Manual:Coding_conventions#Assignment_expressions

Modified Paths:
--------------
    trunk/phase3/includes/Article.php
    trunk/phase3/includes/ChangeTags.php
    trunk/phase3/includes/EditPage.php
    trunk/phase3/includes/Exception.php
    trunk/phase3/includes/Metadata.php
    trunk/phase3/includes/SkinTemplate.php
    trunk/phase3/includes/Title.php
    trunk/phase3/includes/Wiki.php
    trunk/phase3/includes/db/DatabaseMssql.php
    trunk/phase3/includes/diff/DifferenceEngine.php
    trunk/phase3/includes/filerepo/File.php
    trunk/phase3/includes/filerepo/ForeignAPIRepo.php
    trunk/phase3/includes/normal/UtfNormal.php
    trunk/phase3/includes/resourceloader/ResourceLoaderWikiModule.php
    trunk/phase3/includes/specials/SpecialAllpages.php
    trunk/phase3/includes/specials/SpecialExport.php
    trunk/phase3/includes/specials/SpecialNewimages.php
    trunk/phase3/includes/specials/SpecialRecentchangeslinked.php
    trunk/phase3/includes/specials/SpecialVersion.php
(Continue reading)

nad | 1 Nov 2010 02:59
Picon
Favicon

SVN: [75770] trunk/extensions/EmailPage/EmailPage.i18n.php

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75770

Revision: 75770
Author:   nad
Date:     2010-11-01 01:59:34 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
add more messages and remove === from messages, should be in code

Modified Paths:
--------------
    trunk/extensions/EmailPage/EmailPage.i18n.php

Modified: trunk/extensions/EmailPage/EmailPage.i18n.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage.i18n.php	2010-11-01 00:14:21 UTC (rev 75769)
+++ trunk/extensions/EmailPage/EmailPage.i18n.php	2010-11-01 01:59:34 UTC (rev 75770)
 <at>  <at>  -14,24 +14,29  <at>  <at> 
 $messages['en'] = array(
 	'emailpage'           => "E-mail page",
 	'ea-desc'             => "Send rendered HTML page to an e-mail address or list of addresses using
[http://phpmailer.sourceforge.net phpmailer]",
-	'ea-heading'          => "=== E-mailing the page [[$1]] ===",
-	'ea-fromgroup'        => "From group:",
+	'ea-heading'          => "E-mailing the page [[$1]]",
+	'ea-group-info'       => "Additionally you can send the page to the members of a group",
 	'ea-pagesend'         => "Page \"$1\" sent from $2",
-	'ea-nopage'           => "Please specify a page to send, for example \"[[Special:EmailPage/{{MediaWiki:Mainpage-url}}]]\".",
+	'ea-nopage'           => "No page was specified for sending, please use the E-mail links from the sidebar or page actions.",
 	'ea-norecipients'     => "No valid e-mail addresses found!",
(Continue reading)

nad | 1 Nov 2010 03:01
Picon
Favicon

SVN: [75771] trunk/extensions/EmailPage/EmailPage_body.php

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75771

Revision: 75771
Author:   nad
Date:     2010-11-01 02:01:43 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
dont add recipient to list if already rpesent

Modified Paths:
--------------
    trunk/extensions/EmailPage/EmailPage_body.php

Modified: trunk/extensions/EmailPage/EmailPage_body.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage_body.php	2010-11-01 01:59:34 UTC (rev 75770)
+++ trunk/extensions/EmailPage/EmailPage_body.php	2010-11-01 02:01:43 UTC (rev 75771)
 <at>  <at>  -6,7 +6,7  <at>  <at> 
 	var $recipients = array();
 	var $title;
 	var $subject;
-	var $header;
+	var $message;
 	var $group;
 	var $list;
 	var $textonly;
 <at>  <at>  -26,7 +26,7  <at>  <at> 
 	 */
 	function execute( $param ) {
 		global $wgOut, $wgUser, $wgRequest, $wgParser, $wgEmailPageContactsCat, $wgGroupPermissions, $wgSitename,
(Continue reading)

nad | 1 Nov 2010 03:05
Picon
Favicon

SVN: [75772] trunk/extensions/EmailPage

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75772

Revision: 75772
Author:   nad
Date:     2010-11-01 02:05:24 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
key names changed

Modified Paths:
--------------
    trunk/extensions/EmailPage/EmailPage.i18n.php
    trunk/extensions/EmailPage/EmailPage.php

Modified: trunk/extensions/EmailPage/EmailPage.i18n.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage.i18n.php	2010-11-01 02:01:43 UTC (rev 75771)
+++ trunk/extensions/EmailPage/EmailPage.i18n.php	2010-11-01 02:05:24 UTC (rev 75772)
 <at>  <at>  -71,7 +71,7  <at>  <at> 
 	'ea-show' => 'عرض المتلقين',
 	'ea-send' => 'إرسال!',
 	'ea-subject' => 'أدخل سطر عنوان للبريد الإلكتروني',
-	'ea-header' => 'إرسال المحتوى برسالة اختيارية (نص ويكي)',
+	'ea-message' => 'إرسال المحتوى برسالة اختيارية (نص ويكي)',
 	'ea-selectcss' => 'اختر شريحة CSS',
 );

 <at>  <at>  -98,7 +98,7  <at>  <at> 
 	'ea-show' => 'عرض المتلقين',
 	'ea-send' => 'إرسال!',
(Continue reading)

nad | 1 Nov 2010 03:20
Picon
Favicon

SVN: [75773] trunk/extensions/EmailPage

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75773

Revision: 75773
Author:   nad
Date:     2010-11-01 02:20:09 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
add global for the email splitting regex

Modified Paths:
--------------
    trunk/extensions/EmailPage/EmailPage.php
    trunk/extensions/EmailPage/EmailPage_body.php

Modified: trunk/extensions/EmailPage/EmailPage.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage.php	2010-11-01 02:05:24 UTC (rev 75772)
+++ trunk/extensions/EmailPage/EmailPage.php	2010-11-01 02:20:09 UTC (rev 75773)
 <at>  <at>  -13,15 +13,15  <at>  <at> 
  */
 if( !defined( 'MEDIAWIKI' ) ) die( "Not an entry point." );

-define( 'EMAILPAGE_VERSION', "2.1.0, 2010-11-01" );
+define( 'EMAILPAGE_VERSION', "2.1.1, 2010-11-01" );

-$wgEmailPageGroup           = "sysop";              # Users must belong to this group to send emails (empty string means anyone
can send)
-$wgEmailPageCss             = false;                # A minimal CSS page to embed in the email (eg. monobook/main.css without
portlets, actions etc)
-$wgEmailPageAllowRemoteAddr = array( "127.0.0.1" ); # Allow anonymous sending from these addresses
(Continue reading)

nad | 1 Nov 2010 03:22
Picon
Favicon

SVN: [75774] trunk/extensions/EmailPage/EmailPage.i18n.php

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75774

Revision: 75774
Author:   nad
Date:     2010-11-01 02:22:05 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
change msg to "listing n recipients"

Modified Paths:
--------------
    trunk/extensions/EmailPage/EmailPage.i18n.php

Modified: trunk/extensions/EmailPage/EmailPage.i18n.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage.i18n.php	2010-11-01 02:20:09 UTC (rev 75773)
+++ trunk/extensions/EmailPage/EmailPage.i18n.php	2010-11-01 02:22:05 UTC (rev 75774)
 <at>  <at>  -19,7 +19,7  <at>  <at> 
 	'ea-pagesend'         => "Page \"$1\" sent from $2",
 	'ea-nopage'           => "No page was specified for sending, please use the E-mail links from the sidebar or page actions.",
 	'ea-norecipients'     => "No valid e-mail addresses found!",
-	'ea-listrecipients'   => "{{PLURAL:$1|Recipient|$1 recipients}}",
+	'ea-listrecipients'   => "Listing {{PLURAL:$1|Recipient|$1 recipients}}",
 	'ea-error'            => "'''Error sending [[$1]]:''' ''$2''",
 	'ea-denied'           => "Permission denied",
 	'ea-sent'             => "Page [[$1]] sent successfully to '''$2''' {{PLURAL:$2|recipient|recipients}} by [[User:$3|$3]].",
nad | 1 Nov 2010 03:41
Picon
Favicon

SVN: [75775] trunk/extensions/EmailPage/EmailPage_body.php

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/75775

Revision: 75775
Author:   nad
Date:     2010-11-01 02:41:50 +0000 (Mon, 01 Nov 2010)
Log Message:
-----------
default to $wgEmailPageCss if it's set

Modified Paths:
--------------
    trunk/extensions/EmailPage/EmailPage_body.php

Modified: trunk/extensions/EmailPage/EmailPage_body.php
===================================================================
--- trunk/extensions/EmailPage/EmailPage_body.php	2010-11-01 02:22:05 UTC (rev 75774)
+++ trunk/extensions/EmailPage/EmailPage_body.php	2010-11-01 02:41:50 UTC (rev 75775)
 <at>  <at>  -127,7 +127,8  <at>  <at> 
 		);
 		while( $row = $db->fetchRow( $res ) ) {
 			$t = Title::newFromID( $row[0] )->getPrefixedText();
-			$selected = $t == $this->css ? ' selected' : '';
+			if( $this->css ) $selected = $t == $this->css ? ' selected' : '';
+			else $selected = $t == $wgEmailPageCss ? ' selected' : '';
 			$options .= "<option$selected>$t</option>";
 		}
 		$db->freeResult( $res );

Gmane