diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 18:09:56 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-11 18:09:56 +0200 |
| commit | 90c2bf26c04c9bb08214264ef63a60d4e12be5a8 (patch) | |
| tree | e1037cc28c2a460088178333f2412648184b9991 | |
| parent | 8d17cf5a70744b3e8cfd4edf57d2924658414604 (diff) | |
| parent | e28b1a838942b05d79451428f4d2e8fef74cc324 (diff) | |
| download | forums-90c2bf26c04c9bb08214264ef63a60d4e12be5a8.tar forums-90c2bf26c04c9bb08214264ef63a60d4e12be5a8.tar.gz forums-90c2bf26c04c9bb08214264ef63a60d4e12be5a8.tar.bz2 forums-90c2bf26c04c9bb08214264ef63a60d4e12be5a8.tar.xz forums-90c2bf26c04c9bb08214264ef63a60d4e12be5a8.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12526] Fix undefined index: filesize when editing PM with attachments.
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_compose.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_compose.php b/phpBB/includes/ucp/ucp_pm_compose.php index 16b3ca8573..3a3343f199 100644 --- a/phpBB/includes/ucp/ucp_pm_compose.php +++ b/phpBB/includes/ucp/ucp_pm_compose.php @@ -492,7 +492,7 @@ function compose_pm($id, $mode, $action, $user_folders = array()) if ($message_attachment && !$submit && !$refresh && !$preview && $action == 'edit') { // Do not change to SELECT * - $sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename + $sql = 'SELECT attach_id, is_orphan, attach_comment, real_filename, filesize FROM ' . ATTACHMENTS_TABLE . " WHERE post_msg_id = $msg_id AND in_message = 1 |