mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
Merge branch '3.2.x'
This commit is contained in:
commit
c880d73fe8
1 changed files with 10 additions and 0 deletions
|
@ -417,6 +417,11 @@ class content_visibility
|
||||||
return array();
|
return array();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!function_exists('truncate_string'))
|
||||||
|
{
|
||||||
|
include($this->phpbb_root_path . 'includes/functions_content.' . $this->php_ext);
|
||||||
|
}
|
||||||
|
|
||||||
$data = array(
|
$data = array(
|
||||||
'post_visibility' => (int) $visibility,
|
'post_visibility' => (int) $visibility,
|
||||||
'post_delete_user' => (int) $user_id,
|
'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
|
// Note, we do not set a reason for the posts, just for the topic
|
||||||
$data = array(
|
$data = array(
|
||||||
'topic_visibility' => (int) $visibility,
|
'topic_visibility' => (int) $visibility,
|
||||||
|
|
Loading…
Add table
Reference in a new issue