makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/soft-delete] Make update file runnable again

Browse source 
This should not really be a problem, as if the column does not exist, all
topics should be localised before anyway. If not, the user created an
old global announcement, after updating it.

PHPBB3-9657
This commit is contained in:
Joas Schilling 2012-12-19 11:47:08 +01:00
parent 45d1558b7e
commit 73e59ac544
1 changed files with 71 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
phpBB/install/database_update.php
View file

@ -2552,14 +2552,6 @@ function change_database_data(&$no_updates, $version)
FROM ' . TOPICS_TABLE . ' FROM ' . TOPICS_TABLE . '
WHERE forum_id = 0 WHERE forum_id = 0
AND topic_type = ' . POST_GLOBAL; AND topic_type = ' . POST_GLOBAL;
}
else
{
$sql = 'SELECT topic_id, topic_visibility, (topic_replies + 1) AS topic_posts_approved, topic_last_post_id, topic_last_post_subject, topic_last_post_time, topic_last_poster_id, topic_last_poster_name, topic_last_poster_colour
FROM ' . TOPICS_TABLE . '
WHERE forum_id = 0
AND topic_type = ' . POST_GLOBAL;
}
$result = $db->sql_query($sql); $result = $db->sql_query($sql);
$global_announcements = $update_lastpost_data = array(); $global_announcements = $update_lastpost_data = array();
@ -2639,6 +2631,7 @@ function change_database_data(&$no_updates, $version)
} }
unset($table_ary); unset($table_ary);
} }
}
// Allow custom profile fields in pm templates // Allow custom profile fields in pm templates
if (!isset($config['load_cpf_pm'])) if (!isset($config['load_cpf_pm']))