Index: trunk/phase3/includes/Article.php |
— | — | @@ -1673,7 +1673,7 @@ |
1674 | 1674 | if( $protect ) |
1675 | 1675 | $comment .= " [$updated]"; |
1676 | 1676 | $nullRevision = Revision::newNullRevision( $dbw, $id, $comment, true ); |
1677 | | - $nullRevision->insertOn( $dbw ); |
| 1677 | + $nullRevId = $nullRevision->insertOn( $dbw ); |
1678 | 1678 | |
1679 | 1679 | # Update restrictions table |
1680 | 1680 | foreach( $limit as $action => $restrictions ) { |
— | — | @@ -1687,11 +1687,16 @@ |
1688 | 1688 | } |
1689 | 1689 | } |
1690 | 1690 | |
1691 | | - # Blank page_restrictions on page record if they're being used. |
1692 | | - if ($this->mTitle->mOldRestrictions) { |
1693 | | - $dbw->update( 'page', array ( 'page_restrictions' => '' ), array ( 'page_id' => $id ), __METHOD__ ); |
1694 | | - } |
1695 | | - |
| 1691 | + # Update page record |
| 1692 | + $dbw->update( 'page', |
| 1693 | + array( /* SET */ |
| 1694 | + 'page_touched' => $dbw->timestamp(), |
| 1695 | + 'page_restrictions' => '', |
| 1696 | + 'page_latest' => $nullRevId |
| 1697 | + ), array( /* WHERE */ |
| 1698 | + 'page_id' => $id |
| 1699 | + ), 'Article::protect' |
| 1700 | + ); |
1696 | 1701 | wfRunHooks( 'ArticleProtectComplete', array( &$this, &$wgUser, $limit, $reason ) ); |
1697 | 1702 | |
1698 | 1703 | # Update the protection log |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -65,6 +65,7 @@ |
66 | 66 | * Unmaintained Oracle support files have been removed. |
67 | 67 | * Made Linker::userToolLinks() show the contribs link red when the user has zero edits |
68 | 68 | * Use browser default for printing size, don't force to 11pt |
| 69 | +* (bug 8632) Fix regression in page protection null edit update |
69 | 70 | |
70 | 71 | |
71 | 72 | == Languages updated == |