http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100760
Revision: 100760
Author: reedy
Date: 2011-10-25 23:08:58 +0000 (Tue, 25 Oct 2011)
Log Message:
-----------
1.18wmf1 MFT r100092, r100419, r100686, r100692
Modified Paths:
--------------
branches/wmf/1.18wmf1/extensions/AbuseFilter/AbuseFilter.hooks.php
branches/wmf/1.18wmf1/extensions/CodeReview/modules/ext.codereview.js
branches/wmf/1.18wmf1/extensions/Collection/js/collection.js
Property Changed:
----------------
branches/wmf/1.18wmf1/extensions/
branches/wmf/1.18wmf1/extensions/CodeReview/
branches/wmf/1.18wmf1/extensions/Collection/
branches/wmf/1.18wmf1/extensions/Collection/js/collection.js
Property changes on: branches/wmf/1.18wmf1/extensions
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/trunk/extensions:99592,99653
/trunk/phase3/extensions:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
+ /branches/REL1_15/phase3/extensions:51646
/branches/REL1_17/phase3/extensions:81445,81448
/branches/new-installer/phase3/extensions:43664-66004
/branches/sqlite/extensions:58211-58321
/trunk/extensions:99592,99653,100092,100419,100686,100692
/trunk/phase3/extensions:92580,92634,92713,92762,92765,92791,92854,92884,92886-92887,92894,92898,92907,92932,92958,93141,93149,93151,93233-93234,93258,93266,93303,93516-93518,93520,93818-93822,93847,93858,93891,93935-93936,94058,94062,94068,94107,94155,94235,94277,94346,94372,94422,94425,94444,94448,94456,94498,94517,94601,94630,94728,94738,94825,94862,94995-94997,95023,95042,95072-95073,95155,95327,95332,95410,95422,95426,95442,95468,95601,95812,98578,98598,98656
Modified: branches/wmf/1.18wmf1/extensions/AbuseFilter/AbuseFilter.hooks.php
===================================================================
--- branches/wmf/1.18wmf1/extensions/AbuseFilter/AbuseFilter.hooks.php
2011-10-25 22:51:47 UTC (rev 100759)
+++ branches/wmf/1.18wmf1/extensions/AbuseFilter/AbuseFilter.hooks.php
2011-10-25 23:08:58 UTC (rev 100760)
@@ -10,18 +10,19 @@
// Load vars
$vars = new AbuseFilterVariableHolder;
- // Cache article object so we can share a parse operation
- $title = $editor->mTitle;
- $articleCacheKey = $title->getNamespace() . ':' .
$title->getText();
- AFComputedVariable::$articleCache[$articleCacheKey] =
$editor->mArticle;
-
// Check for null edits.
$oldtext = '';
if ( $editor->mArticle->exists() ) {
- $oldtext = $editor->mArticle->getContent();
+ // Make sure we load the latest text saved in database
(bug 31656)
+ $oldtext =
$editor->mArticle->getRevision()->getRawText();
}
+ // Cache article object so we can share a parse operation
+ $title = $editor->mTitle;
+ $articleCacheKey = $title->getNamespace() . ':' .
$title->getText();
+ AFComputedVariable::$articleCache[$articleCacheKey] =
$editor->mArticle;
+
if ( strcmp( $oldtext, $text ) == 0 ) {
// Don't trigger for null edits.
return true;
Property changes on: branches/wmf/1.18wmf1/extensions/CodeReview
___________________________________________________________________
Modified: svn:mergeinfo
- /:91549
/branches/REL1_15/phase3/extensions/CodeReview:51646
/branches/new-installer/phase3/extensions/CodeReview:43664-66004
/branches/sqlite/extensions/CodeReview:58211-58321
/branches/wmf/1.16wmf4/extensions/CodeReview:67177,69199,76243,77266
/branches/wmf-deployment/extensions/CodeReview:60970
/trunk/extensions/CodeReview:77974-93070
/trunk/phase3/extensions/CodeReview:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83590
+ /:91549
/branches/REL1_15/phase3/extensions/CodeReview:51646
/branches/new-installer/phase3/extensions/CodeReview:43664-66004
/branches/sqlite/extensions/CodeReview:58211-58321
/branches/wmf/1.16wmf4/extensions/CodeReview:67177,69199,76243,77266
/branches/wmf-deployment/extensions/CodeReview:60970
/trunk/extensions/CodeReview:77974-93070,100092,100419,100686,100692
/trunk/phase3/extensions/CodeReview:79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,81833,83212,83590
Modified: branches/wmf/1.18wmf1/extensions/CodeReview/modules/ext.codereview.js
===================================================================
--- branches/wmf/1.18wmf1/extensions/CodeReview/modules/ext.codereview.js
2011-10-25 22:51:47 UTC (rev 100759)
+++ branches/wmf/1.18wmf1/extensions/CodeReview/modules/ext.codereview.js
2011-10-25 23:08:58 UTC (rev 100760)
@@ -26,7 +26,7 @@
good = false;
}
}
- if( good && tags[i].indexOf( lastTag )
!= -1 ){
+ if( good && ('' + tags[i]).indexOf(
lastTag ) != -1 ){
suggestions.push( doneTags +
tags[i] );
}
}
Property changes on: branches/wmf/1.18wmf1/extensions/Collection
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/Collection:94376
+ /trunk/extensions/Collection:94376,100686,100692
Modified: branches/wmf/1.18wmf1/extensions/Collection/js/collection.js
===================================================================
--- branches/wmf/1.18wmf1/extensions/Collection/js/collection.js
2011-10-25 22:51:47 UTC (rev 100759)
+++ branches/wmf/1.18wmf1/extensions/Collection/js/collection.js
2011-10-25 23:08:58 UTC (rev 100760)
@@ -158,7 +158,7 @@
return;
}
if (!$('#communityCollTitle').length ||
$('#personalCollType:checked').val()) {
- $('#personalCollTitle').attr('disabled', '');
+ $('#personalCollTitle').removeAttr('disabled');
$('#communityCollTitle').attr('disabled', 'disabled');
if (!$.trim($('#personalCollTitle').val())) {
$('#saveButton').attr('disabled', 'disabled');
Property changes on:
branches/wmf/1.18wmf1/extensions/Collection/js/collection.js
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/extensions/Collection/js/collection.js:94376,98982
+ /trunk/extensions/Collection/js/collection.js:94376,98982,100686,100692
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
