Index: branches/5.1.x/units/emoticons/emoticons_config.php
===================================================================
diff -u -N -r13155 -r13548
--- branches/5.1.x/units/emoticons/emoticons_config.php	(.../emoticons_config.php)	(revision 13155)
+++ branches/5.1.x/units/emoticons/emoticons_config.php	(.../emoticons_config.php)	(revision 13548)
@@ -1,6 +1,6 @@
 <?php
 /**
-* @version	$Id: emoticons_config.php 13155 2010-02-23 20:10:29Z alex $
+* @version	$Id: emoticons_config.php 13548 2010-05-11 19:50:00Z alex $
 * @package	In-Bulletin
 * @copyright	Copyright (C) 1997 - 2009 Intechnic. All rights reserved.
 * @license      GNU/GPL
@@ -75,7 +75,12 @@
 			'EmoticonId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0),
 			'Name' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'required' => 1, 'default' => ''),
 			'KeyStroke' => Array ('type' => 'string', 'max_len' => 20, 'not_null' => 1, 'required' => 1, 'default' => ''),
-			'Enabled' => Array ('type' => 'int', 'not_null' => 1, 'default' => 1),
+			'Enabled' => Array (
+				'type' => 'int',
+				'formatter' => 'kOptionsFormatter',
+				'options' => Array (0 => 'la_No', 1 => 'la_Yes',), 'use_phrases' => 1,
+				'default' => 1, 'not_null' => 1,
+			),
 			'EmotionImage' => Array (
 				'type' => 'string', 'max_len' => 255,
 				'formatter' => 'kUploadFormatter', 'allowed_types' => Array ('image/jpeg', 'image/jpg', 'image/gif', 'image/png', 'image/pjpeg'),