Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6281)
+++ /CKEditor/trunk/CHANGES.html	(revision 6282)
@@ -64,4 +64,5 @@
 		<li><a href="http://dev.ckeditor.com/ticket/6872">#6872</a> : [IE] Link target field is not populated properly when no target is set.</li>
 		<li><a href="http://dev.ckeditor.com/ticket/6880">#6880</a> : Better error handling for servers without PHP support</li>
+		<li><a href="http://dev.ckeditor.com/ticket/6628">#6628</a> : Setting config.enterMode from PHP fails</li>
 	</ul>
 	<h3>
Index: /CKEditor/trunk/ckeditor_php4.php
===================================================================
--- /CKEditor/trunk/ckeditor_php4.php	(revision 6281)
+++ /CKEditor/trunk/ckeditor_php4.php	(revision 6282)
@@ -525,5 +525,5 @@
 		$documentRoot = substr($realPath, 0, strlen($realPath) - strlen($selfPath));
 		$fileUrl = substr($file, strlen($documentRoot));
-		$ckeditorUrl = str_replace("ckeditor_php5.php", "", $fileUrl);
+		$ckeditorUrl = str_replace("ckeditor_php4.php", "", $fileUrl);
 
 		return $ckeditorUrl;
@@ -571,4 +571,7 @@
 
 				$val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
+				if (strtoupper(substr($val, 0, 9)) == 'CKEDITOR.') {
+					return $val;
+				}
 
 				return '"' . $val . '"';
Index: /CKEditor/trunk/ckeditor_php5.php
===================================================================
--- /CKEditor/trunk/ckeditor_php5.php	(revision 6281)
+++ /CKEditor/trunk/ckeditor_php5.php	(revision 6282)
@@ -561,4 +561,7 @@
 
 				$val = str_replace($jsonReplaces[0], $jsonReplaces[1], $val);
+				if (strtoupper(substr($val, 0, 9)) == 'CKEDITOR.') {
+					return $val;
+				}
 
 				return '"' . $val . '"';