| Index: branches/REL1_17/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -175,9 +175,6 @@ |
| 176 | 176 | array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), |
| 177 | 177 | array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), |
| 178 | 178 | array( 'doLangLinksLengthUpdate' ), |
| 179 | | - |
| 180 | | - // 1.18 |
| 181 | | - array( 'doUserNewTalkTimestampNotNull' ), |
| 182 | 179 | ); |
| 183 | 180 | } |
| 184 | 181 | |
| — | — | @@ -832,16 +829,4 @@ |
| 833 | 830 | $this->output( "...ll_lang is up-to-date.\n" ); |
| 834 | 831 | } |
| 835 | 832 | } |
| 836 | | - |
| 837 | | - protected function doUserNewTalkTimestampNotNull() { |
| 838 | | - $info = $this->db->fieldInfo( 'user_newtalk', 'user_last_timestamp' ); |
| 839 | | - if ( $info->isNullable() ) { |
| 840 | | - $this->output( "...user_last_timestamp is already nullable.\n" ); |
| 841 | | - return; |
| 842 | | - } |
| 843 | | - |
| 844 | | - $this->output( "Making user_last_timestamp nullable... " ); |
| 845 | | - $this->applyPatch( 'patch-user-newtalk-timestamp-null.sql' ); |
| 846 | | - $this->output( "done.\n" ); |
| 847 | | - } |
| 848 | 833 | } |
| Index: branches/REL1_17/phase3/includes/AutoLoader.php |
| — | — | @@ -712,6 +712,7 @@ |
| 713 | 713 | 'ParserTestStaticParserHook' => 'maintenance/tests/parser/parserTestsStaticParserHook.php', |
| 714 | 714 | 'PopulateCategory' => 'maintenance/populateCategory.php', |
| 715 | 715 | 'PopulateLogSearch' => 'maintenance/populateLogSearch.php', |
| | 716 | + 'PopulateLogUsertext' => 'maintenance/populateLogUsertext.php', |
| 716 | 717 | 'PopulateParentId' => 'maintenance/populateParentId.php', |
| 717 | 718 | 'PopulateRevisionLength' => 'maintenance/populateRevisionLength.php', |
| 718 | 719 | 'RemoteTestRecorder' => 'maintenance/tests/testHelpers.inc', |
| Property changes on: branches/REL1_17/phase3/includes/AutoLoader.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 719 | 720 | Merged /trunk/phase3/includes/AutoLoader.php:r82445 |