diff options
| author | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:20:42 -0400 |
|---|---|---|
| committer | Wesley Fok <wesley.fok@yp.ca> | 2016-08-03 13:20:42 -0400 |
| commit | ba13832085bf05eb5ab19aeb9681b16c7a119df9 (patch) | |
| tree | 7fb014aeb08e614fe060dfeede0ea05885ff4d7d /phpBB/phpbb/content_visibility.php | |
| parent | 2081a7809540db661193be376c1220a2c21acff4 (diff) | |
| parent | f68820762b2d78bc26c59724a3dd98091bb3379b (diff) | |
| download | forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.gz forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.bz2 forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.tar.xz forums-ba13832085bf05eb5ab19aeb9681b16c7a119df9.zip | |
Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x
Diffstat (limited to 'phpBB/phpbb/content_visibility.php')
| -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, |