aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_content.php
diff options
context:
space:
mode:
authorTristan Darricau <tristan.darricau@sensiolabs.com>2016-01-09 17:53:04 +0100
committerTristan Darricau <tristan.darricau@sensiolabs.com>2016-01-09 17:53:04 +0100
commitb2324607ad7d23450aafddbf6fb286fa05e3a9d5 (patch)
tree44b6b7108c59e1e2da190424b0cd8395b3abba47 /phpBB/includes/functions_content.php
parent81cbabc1f6cebb4e93f9897c9e9e099fa9429ffe (diff)
parent3f44f368172f744499055c482dcaccb0108660ab (diff)
downloadforums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar
forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.gz
forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.bz2
forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.tar.xz
forums-b2324607ad7d23450aafddbf6fb286fa05e3a9d5.zip
Merge pull request #4058 from marc1706/ticket/13454
[ticket/13454] Remove unused variables, globals, and parameters * marc1706/ticket/13454: [ticket/13454] Add excessively removed code back [ticket/13454] Remove more unused variables [ticket/13454] Remove double semi-colons [ticket/13454] Remove unused variables [ticket/13454] Fix code sniffer complaints [ticket/13454] Fix a few issues introduced by overdeleting stuff [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables [ticket/13454] Remove unused variables
Diffstat (limited to 'phpBB/includes/functions_content.php')
-rw-r--r--phpBB/includes/functions_content.php6
1 files changed, 1 insertions, 5 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index 997cafdea4..df25451266 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -651,7 +651,7 @@ function generate_text_for_storage(&$text, &$uid, &$bitfield, &$flags, $allow_bb
*/
function generate_text_for_edit($text, $uid, $flags)
{
- global $phpbb_root_path, $phpEx, $phpbb_dispatcher;
+ global $phpbb_dispatcher;
/**
* Use this event to modify the text before it is decoded for editing
@@ -1056,7 +1056,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
// Some basics...
$attachment['extension'] = strtolower(trim($attachment['extension']));
$filename = $phpbb_root_path . $config['upload_path'] . '/' . utf8_basename($attachment['physical_filename']);
- $thumbnail_filename = $phpbb_root_path . $config['upload_path'] . '/thumb_' . utf8_basename($attachment['physical_filename']);
$upload_icon = '';
@@ -1098,7 +1097,6 @@ function parse_attachments($forum_id, &$message, &$attachments, &$update_count_a
if (!$denied)
{
- $l_downloaded_viewed = $download_link = '';
$display_cat = $extensions[$attachment['extension']]['display_cat'];
if ($display_cat == ATTACHMENT_CATEGORY_IMAGE)
@@ -1316,8 +1314,6 @@ function extension_allowed($forum_id, $extension, &$extensions)
*/
function truncate_string($string, $max_length = 60, $max_store_length = 255, $allow_reply = false, $append = '')
{
- $chars = array();
-
$strip_reply = false;
$stripped = false;
if ($allow_reply && strpos($string, 'Re: ') === 0)