Index: /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1407)
+++ /FCKeditor.Java/branches/2.4/src/main/java/net/fckeditor/connector/ConnectorServlet.java	(revision 1408)
@@ -83,4 +83,5 @@
 	private static final Logger logger = LoggerFactory
 			.getLogger(ConnectorServlet.class);
+	private static boolean forceSingleExtension;
 
 	/**
@@ -98,4 +99,7 @@
 			baseFile.mkdirs();
 		}
+		
+		forceSingleExtension = new Boolean(getInitParameter("ForceSingleExtension"));
+
 		logger.info("*** Connector Servlet initialized successfull!");
 	}
@@ -276,6 +280,5 @@
 					else {
 
-						// TODO check if forceSingleExtension is enabled
-						if (false) {
+						if (forceSingleExtension) {
 							filename = forceSingleExtension(filename);
 							baseName = FilenameUtils.removeExtension(filename);
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web.xml	(revision 1407)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web.xml	(revision 1408)
@@ -21,4 +21,8 @@
 			net.fckeditor.connector.ConnectorServlet
 		</servlet-class>
+		<init-param>
+			<param-name>ForceSingleExtension</param-name>
+			<param-value>true</param-value>
+		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
Index: /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web_war.xml
===================================================================
--- /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web_war.xml	(revision 1407)
+++ /FCKeditor.Java/branches/2.4/src/main/webapp/WEB-INF/web_war.xml	(revision 1408)
@@ -21,4 +21,8 @@
 			net.fckeditor.connector.ConnectorServlet
 		</servlet-class>
+		<init-param>
+			<param-name>ForceSingleExtension</param-name>
+			<param-value>true</param-value>
+		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>