diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2007-06-29 13:37:21 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2007-06-29 13:37:21 +0000 |
| commit | 3cb990df4d8d8d09b46a16918e10c6ba2d0fde19 (patch) | |
| tree | 9a4c917587cd288b09139c2361381e8cd5a815ce /phpBB/includes/acp/acp_icons.php | |
| parent | 6f37638caee649060dc9f933af6773652a813035 (diff) | |
| download | forums-3cb990df4d8d8d09b46a16918e10c6ba2d0fde19.tar forums-3cb990df4d8d8d09b46a16918e10c6ba2d0fde19.tar.gz forums-3cb990df4d8d8d09b46a16918e10c6ba2d0fde19.tar.bz2 forums-3cb990df4d8d8d09b46a16918e10c6ba2d0fde19.tar.xz forums-3cb990df4d8d8d09b46a16918e10c6ba2d0fde19.zip | |
#12461
git-svn-id: file:///svn/phpbb/trunk@7809 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_icons.php')
| -rw-r--r-- | phpBB/includes/acp/acp_icons.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_icons.php b/phpBB/includes/acp/acp_icons.php index 66bc377490..ebf058850f 100644 --- a/phpBB/includes/acp/acp_icons.php +++ b/phpBB/includes/acp/acp_icons.php @@ -276,14 +276,14 @@ class acp_icons $image_height = (isset($_POST['height'])) ? request_var('height', array('' => 0)) : array(); $image_add = (isset($_POST['add_img'])) ? request_var('add_img', array('' => 0)) : array(); $image_emotion = request_var('emotion', array('' => ''), true); - $image_code = request_var('code', array('' => '')); + $image_code = request_var('code', array('' => ''), true); $image_display_on_posting = (isset($_POST['display_on_posting'])) ? request_var('display_on_posting', array('' => 0)) : array(); // Ok, add the relevant bits if we are adding new codes to existing emoticons... if (!empty($_POST['add_additional_code'])) { $add_image = request_var('add_image', ''); - $add_code = request_var('add_code', ''); + $add_code = request_var('add_code', '', true); $add_emotion = request_var('add_emotion', '', true); if ($add_image && $add_emotion && $add_code) @@ -336,7 +336,7 @@ class acp_icons } // Image_order holds the 'new' order value - if (!empty($image_order[$image])) + if (!empty($image_order[$image]) && !empty($$image_id[$image])) { $img_sql = array_merge($img_sql, array( $fields . '_order' => $image_order[$image]) |
