aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/admin/admin_smilies.php
diff options
context:
space:
mode:
authorthe_systech <the_systech@users.sourceforge.net>2001-08-28 19:58:01 +0000
committerthe_systech <the_systech@users.sourceforge.net>2001-08-28 19:58:01 +0000
commitf62d3fd486d9286af6e3d7d5faa6a18f54c50292 (patch)
tree72536a3a5c2c7c9837d2290317982420d865111d /phpBB/admin/admin_smilies.php
parent063c6204068fa7d1bddfe67359a68458bbe11680 (diff)
downloadforums-f62d3fd486d9286af6e3d7d5faa6a18f54c50292.tar
forums-f62d3fd486d9286af6e3d7d5faa6a18f54c50292.tar.gz
forums-f62d3fd486d9286af6e3d7d5faa6a18f54c50292.tar.bz2
forums-f62d3fd486d9286af6e3d7d5faa6a18f54c50292.tar.xz
forums-f62d3fd486d9286af6e3d7d5faa6a18f54c50292.zip
Fix so that it doesn't get directory names, only filenames when looking for smiley images (ie CVS)
git-svn-id: file:///svn/phpbb/trunk@939 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/admin/admin_smilies.php')
-rw-r--r--phpBB/admin/admin_smilies.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/admin/admin_smilies.php b/phpBB/admin/admin_smilies.php
index 769e9ce315..91c6b5bbf9 100644
--- a/phpBB/admin/admin_smilies.php
+++ b/phpBB/admin/admin_smilies.php
@@ -40,7 +40,7 @@ $mode = ($HTTP_GET_VARS['mode']) ? $HTTP_GET_VARS['mode'] : $HTTP_POST_VARS['mod
$dir = opendir($phpbb_root_path . $board_config['smilies_path']);
while($file = readdir($dir))
{
- if($file != '.' && $file != '..')
+ if(!is_dir($phpbb_root_path . $board_config['smilies_path'] . '/' . $file))
{
$smiley_images[] = $file;
}