Index: trunk/core/kernel/application.php
===================================================================
diff -u -r1654 -r1662
--- trunk/core/kernel/application.php	(.../application.php)	(revision 1654)
+++ trunk/core/kernel/application.php	(.../application.php)	(revision 1662)
@@ -145,7 +145,7 @@
 		$this->DB = new kDBConnection(SQL_TYPE, Array(&$this,'handleSQLError') );
 		$this->DB->Connect(SQL_SERVER, SQL_USER, SQL_PASS, SQL_DB);
 		$this->DB->debugMode = $this->isDebugMode();
-		
+			
 		$this->SetDefaultConstants();
 				
 		$this->Factory = new kFactory();
@@ -277,6 +277,7 @@
 			$this->registerClass('kCurrencyRates',MODULES_PATH.'/in-commerce/units/rates/currency_rates.php');
 		}
 		
+		$this->registerClass('FCKeditor', DOC_ROOT.BASE_PATH.'/'.ADMIN_DIR.'/editor/cmseditor/fckeditor.php');
 		/*$this->RegisterClass('LoginController', KERNEL_PATH.'/users/login_controller.php');*/
 	}
 	
@@ -296,6 +297,10 @@
 		if (!defined('ADMINS_LIST')) define('ADMINS_LIST', '/users/users.php');
 		if (!defined('USER_MODEL')) define('USER_MODEL', 'Users');
 		if (!defined('DEFAULT_LANGUAGE_ID')) define('DEFAULT_LANGUAGE_ID', 1);
+		
+		$admin_dir = $this->ConfigValue('AdminDirectory');
+		if(!$admin_dir) $admin_dir = 'admin';
+		safeDefine('ADMIN_DIR', $admin_dir);
 	}
 	
 	function ProcessRequest()
@@ -841,11 +846,17 @@
 			$params['admin'] = 1;
 		}
 		
+		if( getArrayValue($params,'escape') )
+		{
+			$ret = addslashes($ret);
+			unset($params['escape']);
+		}
+		
 		foreach ($params as $param => $value)
 		{
 			$ret .= '&'.$param.'='.$value;
 		}
-		if( getArrayValue($params,'escape') ) $ret = addslashes($ret);
+		
 		return $ret;
 	}