diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 22:49:00 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-06-23 22:49:00 +0200 |
| commit | e4437e19e8be79c32945fbb4e79df84e60e73690 (patch) | |
| tree | 5979a8887503cfe857d0625bf8dddd07cca1842d | |
| parent | 5403b487885dd7593a43c198f8baacc194ff1a3a (diff) | |
| download | forums-e4437e19e8be79c32945fbb4e79df84e60e73690.tar forums-e4437e19e8be79c32945fbb4e79df84e60e73690.tar.gz forums-e4437e19e8be79c32945fbb4e79df84e60e73690.tar.bz2 forums-e4437e19e8be79c32945fbb4e79df84e60e73690.tar.xz forums-e4437e19e8be79c32945fbb4e79df84e60e73690.zip | |
[ticket/12612] Prefix upload_popup() with phpbb_
PHPBB3-12612
| -rw-r--r-- | phpBB/includes/functions_posting.php | 2 | ||||
| -rw-r--r-- | phpBB/posting.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index e21b8d4e8c..0b37af0ee0 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -2489,7 +2489,7 @@ function phpbb_bump_topic($forum_id, $topic_id, $post_data, $bump_time = false) /** * Show upload popup (progress bar) */ -function upload_popup($forum_style = 0) +function phpbb_upload_popup($forum_style = 0) { global $template, $user; diff --git a/phpBB/posting.php b/phpBB/posting.php index dedd393858..70df052099 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -195,7 +195,7 @@ switch ($mode) } else { - upload_popup(); + phpbb_upload_popup(); return; } break; @@ -233,7 +233,7 @@ if ($auth->acl_get('m_approve', $forum_id) && ((($mode == 'reply' || $mode == 'b if ($mode == 'popup') { - upload_popup($post_data['forum_style']); + phpbb_upload_popup($post_data['forum_style']); return; } |