diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-07-14 20:11:51 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-07-14 20:11:51 +0200 |
| commit | 61bca182f6b6825c687e5049718a5567aaf04610 (patch) | |
| tree | 41b07eefcff2b2045dd21526df684ab1ba9d0728 | |
| parent | c1cb59c237f66d2bbf0d1666d495b4b47da0fba0 (diff) | |
| parent | 38082c41e371be417e26f375d6f9f207d74cfdde (diff) | |
| download | forums-61bca182f6b6825c687e5049718a5567aaf04610.tar forums-61bca182f6b6825c687e5049718a5567aaf04610.tar.gz forums-61bca182f6b6825c687e5049718a5567aaf04610.tar.bz2 forums-61bca182f6b6825c687e5049718a5567aaf04610.tar.xz forums-61bca182f6b6825c687e5049718a5567aaf04610.zip | |
Merge branch '3.1.x' into 3.2.x
| -rw-r--r-- | phpBB/phpbb/content_visibility.php | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/phpBB/phpbb/content_visibility.php b/phpBB/phpbb/content_visibility.php index 0ba0489cb7..147b8ebbff 100644 --- a/phpBB/phpbb/content_visibility.php +++ b/phpBB/phpbb/content_visibility.php @@ -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, |