http://www.mediawiki.org/wiki/Special:Code/MediaWiki/90956
Revision: 90956
Author: janpaul123
Date: 2011-06-28 13:51:41 +0000 (Tue, 28 Jun 2011)
Log Message:
-----------
Fixes posting to anonymous users. Also shows a warning when posting to
anonymous users, this fixes bug 29620
Modified Paths:
--------------
trunk/extensions/WikiLove/WikiLove.api.php
trunk/extensions/WikiLove/WikiLove.hooks.php
trunk/extensions/WikiLove/WikiLove.i18n.php
trunk/extensions/WikiLove/WikiLove.php
trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js
Modified: trunk/extensions/WikiLove/WikiLove.api.php
===================================================================
--- trunk/extensions/WikiLove/WikiLove.api.php 2011-06-28 13:28:30 UTC (rev
90955)
+++ trunk/extensions/WikiLove/WikiLove.api.php 2011-06-28 13:51:41 UTC (rev
90956)
@@ -56,7 +56,7 @@
global $wgUser;
$dbw = wfGetDB( DB_MASTER );
$receiver = User::newFromName(
$talk->getSubjectPage()->getBaseText() );
- if ( $receiver->isAnon() ) {
+ if ( $receiver === false || $receiver->isAnon() ) {
$this->setWarning( 'Not logging anonymous recipients' );
return;
}
Modified: trunk/extensions/WikiLove/WikiLove.hooks.php
===================================================================
--- trunk/extensions/WikiLove/WikiLove.hooks.php 2011-06-28 13:28:30 UTC
(rev 90955)
+++ trunk/extensions/WikiLove/WikiLove.hooks.php 2011-06-28 13:51:41 UTC
(rev 90956)
@@ -71,7 +71,7 @@
$out->addModules( 'ext.wikiLove.defaultOptions'
);
}
- self::$recipient = $title->getText();
+ self::$recipient = $title->getBaseText();
}
return true;
}
@@ -83,6 +83,12 @@
global $wgUser;
$vars['wikilove-recipient'] = self::$recipient;
$vars['wikilove-edittoken'] = $wgUser->edittoken();
+
+ $vars['wikilove-anon'] = 0;
+ if ( self::$recipient !== '' ) {
+ $receiver = User::newFromName( self::$recipient );
+ if ( $receiver === false || $receiver->isAnon() )
$vars['wikilove-anon'] = 1;
+ }
return true;
}
Modified: trunk/extensions/WikiLove/WikiLove.i18n.php
===================================================================
--- trunk/extensions/WikiLove/WikiLove.i18n.php 2011-06-28 13:28:30 UTC (rev
90955)
+++ trunk/extensions/WikiLove/WikiLove.i18n.php 2011-06-28 13:51:41 UTC (rev
90956)
@@ -47,6 +47,7 @@
'wikilove-err-gallery-again' => 'Try again',
'wikilove-summary' => '/* $1 */ new WikiLove message',
'wikilove-what-is-this' => "What is this?",
+ 'wikilove-anon-warning' => 'Note: This user is not registered, he or
she many not notice this message.',
);
/** Message documentation (Message documentation)
Modified: trunk/extensions/WikiLove/WikiLove.php
===================================================================
--- trunk/extensions/WikiLove/WikiLove.php 2011-06-28 13:28:30 UTC (rev
90955)
+++ trunk/extensions/WikiLove/WikiLove.php 2011-06-28 13:51:41 UTC (rev
90956)
@@ -125,6 +125,7 @@
'wikilove-err-gallery',
'wikilove-err-gallery-again',
'wikilove-what-is-this',
+ 'wikilove-anon-warning',
),
'dependencies' => array(
'jquery.ui.dialog',
Modified: trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js
===================================================================
--- trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js
2011-06-28 13:28:30 UTC (rev 90955)
+++ trunk/extensions/WikiLove/modules/ext.wikiLove/ext.wikiLove.core.js
2011-06-28 13:51:41 UTC (rev 90956)
@@ -59,6 +59,7 @@
<p><a target="_blank" href="http://www.mediawiki.org/wiki/WikiLove";>\
<html:msg key="wikilove-what-is-this"/>\
</a></p>\
+ <p id="mw-wikilove-anon-warning"><strong><html:msg
key="wikilove-anon-warning"/></strong></p>\
</div>\
<div id="mw-wikilove-add-details">\
<span class="mw-wikilove-number">2</span>\
@@ -131,6 +132,8 @@
$( '#mw-wikilove-send-form' ).click(
$.wikiLove.submitSend );
$( '#mw-wikilove-message' ).elastic(); // have the
message textarea grow automatically
+ if ( mw.config.get( 'wikilove-anon' ) === 0 ) $(
'#mw-wikilove-anon-warning' ).hide();
+
// when the input changes, we want to disable the send
button
$( '#mw-wikilove-header' ).change(
$.wikiLove.changeInput );
$( '#mw-wikilove-header' ).keyup(
$.wikiLove.changeInput );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
