Index: branches/5.2.x/units/emoticons/emoticons_config.php
===================================================================
diff -u -N -r14581 -r15556
--- branches/5.2.x/units/emoticons/emoticons_config.php	(.../emoticons_config.php)	(revision 14581)
+++ branches/5.2.x/units/emoticons/emoticons_config.php	(.../emoticons_config.php)	(revision 15556)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: emoticons_config.php 14581 2011-09-23 14:27:22Z alex $
+* @version	$Id: emoticons_config.php 15556 2012-10-04 15:48:56Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -83,7 +83,7 @@
 			),
 			'EmotionImage' => Array (
 				'type' => 'string', 'max_len' => 255,
-				'formatter' => 'kUploadFormatter', 'allowed_types' => Array ('image/jpeg', 'image/jpg', 'image/gif', 'image/png', 'image/pjpeg'),
+				'formatter' => 'kUploadFormatter', 'allowed_types' => Array ('image/jpeg', 'image/jpg', 'image/gif', 'image/png', 'image/pjpeg', 'image/bmp', 'image/x-ms-bmp'),
 				'upload_dir' => SMILEYS_PATH,
 				'not_null' => 1, 'required' => 1, 'default' => '',
 			),