diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-03 23:32:09 +0100 |
| commit | 693a2dc99bf07aeac1865d4a48ddf2589317ac7a (patch) | |
| tree | 8bd926d3671dc9de0a72d4025aaa625a18ba51e1 /phpBB/includes/functions_posting.php | |
| parent | b68de2323d6444b4b3685a98bbcb9500a38e45cb (diff) | |
| parent | ac329275662f737f03f485107cb69412739c1afa (diff) | |
| download | forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.gz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.bz2 forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.tar.xz forums-693a2dc99bf07aeac1865d4a48ddf2589317ac7a.zip | |
Merge branch 'develop-olympus' into develop
I simply used the develop-olympus version of all files that conflicted.
Afterall there should not have been anything new in develop yet.
Diffstat (limited to 'phpBB/includes/functions_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 069740ebda..21c5fe7aca 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -46,7 +46,7 @@ function generate_smilies($mode, $forum_id) page_header($user->lang['SMILIES']); - $sql = 'SELECT COUNT(smiley_id) AS count + $sql = 'SELECT COUNT(smiley_id) AS item_count FROM ' . SMILIES_TABLE . ' GROUP BY smiley_url'; $result = $db->sql_query($sql, 3600); @@ -85,10 +85,10 @@ function generate_smilies($mode, $forum_id) if ($mode == 'window') { - $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height + $sql = 'SELECT smiley_url, MIN(emotion) as emotion, MIN(code) AS code, smiley_width, smiley_height, MIN(smiley_order) AS min_smiley_order FROM ' . SMILIES_TABLE . ' GROUP BY smiley_url, smiley_width, smiley_height - ORDER BY smiley_order'; + ORDER BY min_smiley_order'; $result = $db->sql_query_limit($sql, $config['smilies_per_page'], $start, 3600); } else @@ -2525,7 +2525,7 @@ function submit_post($mode, $subject, $username, $topic_type, &$poll, &$data, $u VALUES (' . $user->data['user_id'] . ', ' . $data['topic_id'] . ')'; $db->sql_query($sql); } - else if ($data['notify_set'] && !$data['notify']) + else if (($config['email_enable'] || $config['jab_enable']) && $data['notify_set'] && !$data['notify']) { $sql = 'DELETE FROM ' . TOPICS_WATCH_TABLE . ' WHERE user_id = ' . $user->data['user_id'] . ' |