diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2008-11-05 22:03:16 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2008-11-05 22:03:16 +0000 |
| commit | 538acb3db5e91f983849cd70fa754bb29ee364a0 (patch) | |
| tree | f58e7f24795d617f50dbb61c7a5a362025b7c721 | |
| parent | 1610334913db6cc3b0e23b462cd66a699f06c18e (diff) | |
| download | forums-538acb3db5e91f983849cd70fa754bb29ee364a0.tar forums-538acb3db5e91f983849cd70fa754bb29ee364a0.tar.gz forums-538acb3db5e91f983849cd70fa754bb29ee364a0.tar.bz2 forums-538acb3db5e91f983849cd70fa754bb29ee364a0.tar.xz forums-538acb3db5e91f983849cd70fa754bb29ee364a0.zip | |
Remove deprecated language key and update any references in the database to the correct one.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9049 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/install/database_update.php | 10 | ||||
| -rw-r--r-- | phpBB/language/en/acp/common.php | 5 |
2 files changed, 10 insertions, 5 deletions
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' => '<strong>Edited word censor</strong><br />ยป %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 |