| Index: branches/wmf/1.18wmf1/extensions/AbuseFilter/AbuseFilter.hooks.php |
| — | — | @@ -10,18 +10,19 @@ |
| 11 | 11 | // Load vars |
| 12 | 12 | $vars = new AbuseFilterVariableHolder; |
| 13 | 13 | |
| 14 | | - // Cache article object so we can share a parse operation |
| 15 | | - $title = $editor->mTitle; |
| 16 | | - $articleCacheKey = $title->getNamespace() . ':' . $title->getText(); |
| 17 | | - AFComputedVariable::$articleCache[$articleCacheKey] = $editor->mArticle; |
| 18 | | - |
| 19 | 14 | // Check for null edits. |
| 20 | 15 | $oldtext = ''; |
| 21 | 16 | |
| 22 | 17 | if ( $editor->mArticle->exists() ) { |
| 23 | | - $oldtext = $editor->mArticle->getContent(); |
| | 18 | + // Make sure we load the latest text saved in database (bug 31656) |
| | 19 | + $oldtext = $editor->mArticle->getRevision()->getRawText(); |
| 24 | 20 | } |
| 25 | 21 | |
| | 22 | + // Cache article object so we can share a parse operation |
| | 23 | + $title = $editor->mTitle; |
| | 24 | + $articleCacheKey = $title->getNamespace() . ':' . $title->getText(); |
| | 25 | + AFComputedVariable::$articleCache[$articleCacheKey] = $editor->mArticle; |
| | 26 | + |
| 26 | 27 | if ( strcmp( $oldtext, $text ) == 0 ) { |
| 27 | 28 | // Don't trigger for null edits. |
| 28 | 29 | return true; |
| Index: branches/wmf/1.18wmf1/extensions/Collection/js/collection.js |
| — | — | @@ -158,7 +158,7 @@ |
| 159 | 159 | return; |
| 160 | 160 | } |
| 161 | 161 | if (!$('#communityCollTitle').length || $('#personalCollType:checked').val()) { |
| 162 | | - $('#personalCollTitle').attr('disabled', ''); |
| | 162 | + $('#personalCollTitle').removeAttr('disabled'); |
| 163 | 163 | $('#communityCollTitle').attr('disabled', 'disabled'); |
| 164 | 164 | if (!$.trim($('#personalCollTitle').val())) { |
| 165 | 165 | $('#saveButton').attr('disabled', 'disabled'); |
| Property changes on: branches/wmf/1.18wmf1/extensions/Collection/js/collection.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 166 | 166 | Merged /trunk/extensions/Collection/js/collection.js:r100686,100692 |
| Property changes on: branches/wmf/1.18wmf1/extensions/Collection |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 167 | 167 | Merged /trunk/extensions/Collection:r100686,100692 |
| Index: branches/wmf/1.18wmf1/extensions/CodeReview/modules/ext.codereview.js |
| — | — | @@ -26,7 +26,7 @@ |
| 27 | 27 | good = false; |
| 28 | 28 | } |
| 29 | 29 | } |
| 30 | | - if( good && tags[i].indexOf( lastTag ) != -1 ){ |
| | 30 | + if( good && ('' + tags[i]).indexOf( lastTag ) != -1 ){ |
| 31 | 31 | suggestions.push( doneTags + tags[i] ); |
| 32 | 32 | } |
| 33 | 33 | } |
| Property changes on: branches/wmf/1.18wmf1/extensions/CodeReview |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 34 | 34 | Merged /trunk/extensions/CodeReview:r100092,100419,100686,100692 |
| Property changes on: branches/wmf/1.18wmf1/extensions |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 35 | 35 | Merged /trunk/extensions:r100092,100419,100686,100692 |