aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorHenry Sudhof <kellanved@phpbb.com>2007-04-24 11:19:35 +0000
committerHenry Sudhof <kellanved@phpbb.com>2007-04-24 11:19:35 +0000
commitc4cae36c912c56e770f56503e839cc8cd69bc578 (patch)
treed86a3f8f0de9b4010b2e141b3bdf977c29377868 /phpBB/includes
parent99b9d56ba8b7d0748687e335ac2eb18ce65710fa (diff)
downloadforums-c4cae36c912c56e770f56503e839cc8cd69bc578.tar
forums-c4cae36c912c56e770f56503e839cc8cd69bc578.tar.gz
forums-c4cae36c912c56e770f56503e839cc8cd69bc578.tar.bz2
forums-c4cae36c912c56e770f56503e839cc8cd69bc578.tar.xz
forums-c4cae36c912c56e770f56503e839cc8cd69bc578.zip
ah. Where did those line breaks go?
git-svn-id: file:///svn/phpbb/trunk@7393 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_convert.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_convert.php b/phpBB/includes/functions_convert.php
index 91dfd2de77..6da8aedf66 100644
--- a/phpBB/includes/functions_convert.php
+++ b/phpBB/includes/functions_convert.php
@@ -2150,6 +2150,7 @@ function convert_bbcode($message, $convert_size = true, $extended_bbcodes = fals
function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $source_relative_path = true)
{
global $convert, $phpbb_root_path, $config, $user, $db;
+
if (substr($trg, -1) == '/')
{
$trg .= basename($src);
@@ -2161,6 +2162,7 @@ function copy_file($src, $trg, $overwrite = false, $die_on_failure = true, $sour
{
return true;
}
+
if (!@file_exists($src_path))
{
return;