aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2004-12-12 14:07:02 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2004-12-12 14:07:02 +0000
commit20d18e1a9fec071d6e2e519709b08bacf650d750 (patch)
treee6f71aa6625aae6ef8602b42716a7e531662c626 /phpBB/includes/mcp
parentaf82f666589ab73e2e2727015d82c611c93a9c6a (diff)
downloadforums-20d18e1a9fec071d6e2e519709b08bacf650d750.tar
forums-20d18e1a9fec071d6e2e519709b08bacf650d750.tar.gz
forums-20d18e1a9fec071d6e2e519709b08bacf650d750.tar.bz2
forums-20d18e1a9fec071d6e2e519709b08bacf650d750.tar.xz
forums-20d18e1a9fec071d6e2e519709b08bacf650d750.zip
- fix attachment mod errors
- make upload path consistent with all other 2.2 path settings - fix "post title wrong after split" bug git-svn-id: file:///svn/phpbb/trunk@5032 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/mcp')
-rw-r--r--phpBB/includes/mcp/mcp_main.php4
-rw-r--r--phpBB/includes/mcp/mcp_topic.php6
2 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_main.php b/phpBB/includes/mcp/mcp_main.php
index 44e6b5acd6..743b745f8f 100644
--- a/phpBB/includes/mcp/mcp_main.php
+++ b/phpBB/includes/mcp/mcp_main.php
@@ -869,8 +869,8 @@ function mcp_fork_topic($topic_ids)
'topic_id' => (int) $new_topic_id,
'in_message' => 0,
'poster_id' => (int) $attach_row['poster_id'],
- 'physical_filename' => (string) $attach_row['physical_filename'],
- 'real_filename' => (string) $attach_row['real_filename'],
+ 'physical_filename' => (string) basename($attach_row['physical_filename']),
+ 'real_filename' => (string) basename($attach_row['real_filename']),
'download_count' => (int) $attach_row['download_count'],
'comment' => (string) $attach_row['comment'],
'extension' => (string) $attach_row['extension'],
diff --git a/phpBB/includes/mcp/mcp_topic.php b/phpBB/includes/mcp/mcp_topic.php
index 2004e51874..683dd0776e 100644
--- a/phpBB/includes/mcp/mcp_topic.php
+++ b/phpBB/includes/mcp/mcp_topic.php
@@ -358,6 +358,12 @@ function split_topic($mode, $topic_id, $to_forum_id, $subject)
$to_topic_id = $db->sql_nextid();
move_posts($post_id_list, $to_topic_id);
+ // Change topic title of first post
+ $sql = 'UPDATE ' . POSTS_TABLE . "
+ SET post_subject = '" . $db->sql_escape($subject) . "'
+ WHERE post_id = {$post_id_list[0]}";
+ $db->sql_query($sql);
+
$success_msg = 'TOPIC_SPLIT_SUCCESS';
// Link back to both topics