diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 08:57:20 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 08:57:20 -0700 |
| commit | 87795eba55172ed43119dd0ee022db68cf3ba8f6 (patch) | |
| tree | 046da75f4a7ff4de734584b021ab86c06ea1feff /phpBB/develop/merge_post_tables.php | |
| parent | d879acb7cca1a05a9adacc2376ab4118bd81ab4a (diff) | |
| parent | 167ca1f33f8265e5dea6481cc69de16ccfdd0dce (diff) | |
| download | forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar.gz forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar.bz2 forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.tar.xz forums-87795eba55172ed43119dd0ee022db68cf3ba8f6.zip | |
Merge pull request #1017 from nickvergessen/feature/softdelete-1-permission
Soft delete
Diffstat (limited to 'phpBB/develop/merge_post_tables.php')
| -rw-r--r-- | phpBB/develop/merge_post_tables.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/develop/merge_post_tables.php b/phpBB/develop/merge_post_tables.php index 8edc330a0a..d687a292f2 100644 --- a/phpBB/develop/merge_post_tables.php +++ b/phpBB/develop/merge_post_tables.php @@ -50,7 +50,7 @@ switch ($db->sql_layer) ADD PRIMARY KEY (post_id), ADD INDEX topic_id (topic_id), ADD INDEX poster_ip (poster_ip), - ADD INDEX post_approved (post_approved), + ADD INDEX post_visibility (post_visibility), MODIFY COLUMN post_id mediumint(8) UNSIGNED NOT NULL auto_increment, ADD COLUMN post_encoding varchar(11) DEFAULT \'iso-8859-15\' NOT NULL'; break; @@ -162,7 +162,7 @@ while ($row = $db->sql_fetchrow($result)) $forum_id = $row['forum_id']; $sql_ary[] = "UPDATE " . $table_prefix . "forums - SET forum_last_poster_id = " . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? $row['user_id'] : ANONYMOUS) . ", forum_last_poster_name = '" . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? addslashes($row['username']) : addslashes($row['post_username'])) . "', forum_last_post_time = " . $row['post_time'] . ", forum_posts = " . (($post_count[$forum_id]) ? $post_count[$forum_id] : 0) . ", forum_topics = " . (($topic_count[$forum_id]) ? $topic_count[$forum_id] : 0) . " + SET forum_last_poster_id = " . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? $row['user_id'] : ANONYMOUS) . ", forum_last_poster_name = '" . ((!empty($row['user_id']) && $row['user_id'] != ANONYMOUS) ? addslashes($row['username']) : addslashes($row['post_username'])) . "', forum_last_post_time = " . $row['post_time'] . ", forum_posts_approved = " . (($post_count[$forum_id]) ? $post_count[$forum_id] : 0) . ", forum_topics_approved = " . (($topic_count[$forum_id]) ? $topic_count[$forum_id] : 0) . " WHERE forum_id = $forum_id"; $sql = "SELECT t.topic_id, u.username, u.user_id, u2.username as user2, u2.user_id as id2, p.post_username, p2.post_username AS post_username2, p2.post_time |