mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-08 16:45:19 +02:00
Code Issues Releases Wiki Activity

Remove deprecated language key and update any references in the database to the correct one.

Browse Source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9049 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Chris Smith 2008-11-05 22:03:16 +00:00
parent 1610334913
commit 538acb3db5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/install/database_update.php
View File

@ -1935,6 +1935,16 @@ function change_database_data(&$no_updates, $version)
$no_updates = false; $no_updates = false;
break; 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;
} }
} }

5
phpBB/language/en/acp/common.php
View File

@ -688,9 +688,4 @@ $lang = array_merge($lang, array(
'LOG_WORD_EDIT' => '<strong>Edited word censor</strong><br />» %s', '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'];
?> ?>