aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-04-30 14:24:13 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-04-30 14:24:13 +0000
commit0dec4135c54085caf9fd31f40ad4ff1fe94ba071 (patch)
tree8c4949c654d6d244f59d98a76b456fe334205581 /phpBB/includes/functions_posting.php
parent7eee98f316bc587fe7e73eaf5aa0aff3e1809ffb (diff)
downloadforums-0dec4135c54085caf9fd31f40ad4ff1fe94ba071.tar
forums-0dec4135c54085caf9fd31f40ad4ff1fe94ba071.tar.gz
forums-0dec4135c54085caf9fd31f40ad4ff1fe94ba071.tar.bz2
forums-0dec4135c54085caf9fd31f40ad4ff1fe94ba071.tar.xz
forums-0dec4135c54085caf9fd31f40ad4ff1fe94ba071.zip
- test slightly modified topic tracking code
- some bugfixes git-svn-id: file:///svn/phpbb/trunk@5135 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index c43c809562..b53492a5a7 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -70,7 +70,7 @@ function generate_smilies($mode, $forum_id)
'SMILEY_IMG' => $phpbb_root_path . $config['smilies_path'] . '/' . $row['smiley_url'],
'SMILEY_WIDTH' => $row['smiley_width'],
'SMILEY_HEIGHT' => $row['smiley_height'],
- 'SMILEY_DESC' => $row['smiley'])
+ 'SMILEY_DESC' => $row['emotion'])
);
}
$db->sql_freeresult($result);