Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2016-07-14 20:11:51 +02:00
commit 61bca182f6

View file

@ -417,6 +417,11 @@ class content_visibility
return array();
}
if (!function_exists('truncate_string'))
{
include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext);
}
$data = array(
'post_visibility' => (int) $visibility,
'post_delete_user' => (int) $user_id,
@ -628,6 +633,11 @@ class content_visibility
}
}
if (!function_exists('truncate_string'))
{
include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext);
}
// Note, we do not set a reason for the posts, just for the topic
$data = array(
'topic_visibility' => (int) $visibility,