| Index: trunk/phase3/includes/ImagePage.php |
| — | — | @@ -1,5 +1,8 @@ |
| 2 | 2 | <?php |
| 3 | 3 | |
| | 4 | +if ( !defined( 'MEDIAWIKI' ) ) |
| | 5 | + die( 1 ); |
| | 6 | + |
| 4 | 7 | /** |
| 5 | 8 | * Special handling for image description pages |
| 6 | 9 | * |
| — | — | @@ -7,10 +10,10 @@ |
| 8 | 11 | */ |
| 9 | 12 | class ImagePage extends Article { |
| 10 | 13 | |
| 11 | | - private $img; // Image object |
| 12 | | - private $displayImg; |
| 13 | | - private $repo; |
| 14 | | - private $fileLoaded; |
| | 14 | + /* private */ var $img; // Image object |
| | 15 | + /* private */ var $displayImg; |
| | 16 | + /* private */ var $repo; |
| | 17 | + /* private */ var $fileLoaded; |
| 15 | 18 | var $mExtraDescription = false; |
| 16 | 19 | var $dupes; |
| 17 | 20 | |
| Index: trunk/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -489,6 +489,21 @@ |
| 490 | 490 | $this->output( "...ss_active_users user count set...\n" ); |
| 491 | 491 | } |
| 492 | 492 | |
| | 493 | + protected function doLogUsertextPopulation() { |
| | 494 | + if ( $this->updateRowExists( 'populate log_usertext' ) ) { |
| | 495 | + $this->output( "...log_user_text field already populated.\n" ); |
| | 496 | + return; |
| | 497 | + } |
| | 498 | + |
| | 499 | + $this->output( |
| | 500 | + "Populating log_user_text field, printing progress markers. For large\n" . |
| | 501 | + "databases, you may want to hit Ctrl-C and do this manually with\n" . |
| | 502 | + "maintenance/populateLogUsertext.php.\n" ); |
| | 503 | + $task = new PopulateLogUsertext(); |
| | 504 | + $task->execute(); |
| | 505 | + $this->output( "Done populating log_user_text field.\n" ); |
| | 506 | + } |
| | 507 | + |
| 493 | 508 | protected function doLogSearchPopulation() { |
| 494 | 509 | if ( $this->updateRowExists( 'populate log_search' ) ) { |
| 495 | 510 | $this->output( "...log_search table already populated.\n" ); |
| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -147,8 +147,9 @@ |
| 148 | 148 | // 1.16 |
| 149 | 149 | array( 'addTable', 'user_properties', 'patch-user_properties.sql' ), |
| 150 | 150 | array( 'addTable', 'log_search', 'patch-log_search.sql' ), |
| | 151 | + array( 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ), |
| | 152 | + array( 'doLogUsertextPopulation' ), # listed separately from the previous update because 1.16 was released without this update |
| 151 | 153 | array( 'doLogSearchPopulation' ), |
| 152 | | - array( 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ), |
| 153 | 154 | array( 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ), |
| 154 | 155 | array( 'addTable', 'external_user', 'patch-external_user.sql' ), |
| 155 | 156 | array( 'addIndex', 'log_search', 'ls_field_val', 'patch-log_search-rename-index.sql' ), |
| Index: trunk/phase3/includes/installer/SqliteUpdater.php |
| — | — | @@ -30,8 +30,9 @@ |
| 31 | 31 | // 1.16 |
| 32 | 32 | array( 'addTable', 'user_properties', 'patch-user_properties.sql' ), |
| 33 | 33 | array( 'addTable', 'log_search', 'patch-log_search.sql' ), |
| | 34 | + array( 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ), |
| | 35 | + array( 'doLogUsertextPopulation' ), # listed separately from the previous update because 1.16 was released without this update |
| 34 | 36 | array( 'doLogSearchPopulation' ), |
| 35 | | - array( 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ), |
| 36 | 37 | array( 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ), |
| 37 | 38 | array( 'addTable', 'external_user', 'patch-external_user.sql' ), |
| 38 | 39 | array( 'addIndex', 'log_search', 'ls_field_val', 'patch-log_search-rename-index.sql' ), |
| Index: trunk/phase3/includes/AutoLoader.php |
| — | — | @@ -718,6 +718,7 @@ |
| 719 | 719 | 'DeleteDefaultMessages' => 'maintenance/deleteDefaultMessages.php', |
| 720 | 720 | 'PopulateCategory' => 'maintenance/populateCategory.php', |
| 721 | 721 | 'PopulateLogSearch' => 'maintenance/populateLogSearch.php', |
| | 722 | + 'PopulateLogUsertext' => 'maintenance/populateLogUsertext.php', |
| 722 | 723 | 'PopulateParentId' => 'maintenance/populateParentId.php', |
| 723 | 724 | 'PopulateRevisionLength' => 'maintenance/populateRevisionLength.php', |
| 724 | 725 | 'SevenZipStream' => 'maintenance/7zip.inc', |