diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php index e84d63a950..a6abc21508 100644 --- a/phpBB/install/database_update.php +++ b/phpBB/install/database_update.php @@ -1935,6 +1935,16 @@ function change_database_data(&$no_updates, $version) $no_updates = false; break; + + // Changes from 3.0.3-RC1 to 3.0.3-RC2 + case '3.0.3-RC1': + $sql = 'UPDATE ' . LOG_TABLE . " + SET log_operation = 'LOG_DELETE_TOPIC' + WHERE log_operation = 'LOG_TOPIC_DELETED'"; + _sql($sql, $errored, $error_ary); + + $no_updates = false; + break; } } diff --git a/phpBB/language/en/acp/common.php b/phpBB/language/en/acp/common.php index a9708308ac..c1317b4615 100644 --- a/phpBB/language/en/acp/common.php +++ b/phpBB/language/en/acp/common.php @@ -688,9 +688,4 @@ $lang = array_merge($lang, array( 'LOG_WORD_EDIT' => 'Edited word censor
ยป %s', )); -// Two language keys with the same text were used in different locations -// LOG_DELETE_TOPIC is the correct one, this line is here so that existing -// log entries are not broken. Ensure it is included in your language file. -$lang['LOG_TOPIC_DELETED'] = $lang['LOG_DELETE_TOPIC']; - ?> \ No newline at end of file