1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-23 00:32:57 +02:00
git-svn-id: file:///svn/phpbb/trunk@7809 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2007-06-29 13:37:21 +00:00
parent 6f37638cae
commit 3cb990df4d
5 changed files with 68 additions and 13 deletions

View File

@@ -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])