Ticket #4924: 4924.patch

ckeditor_php4.php

@@ -456 +456 @@
                 $args = "";
                 $ckeditorPath = $this->ckeditorPath();
 
-                if (!empty($this->timestamp) && $this->timestamp != "%TIMESTAMP%") {
+                if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
                         $args = '?t=' . $this->timestamp;
                 }
 
@@ -473 +473 @@
                         $extraCode .= ($extraCode ? "\n" : "") . "if (typeof(CKEDITOR) == 'undefined') { alert('The CKEDITOR object was not found. Please make sure that the ckeditor.js file is available in your installation.'); }";
                 }
                 // %REMOVE_END%
-                if (!empty($this->timestamp) && $this->timestamp != $this->_timestamp) {
+                if ($this->timestamp != $this->_timestamp) {
                         $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
                 }
                 if ($extraCode) {

ckeditor_php5.php

@@ -448 +448 @@
                 $args = "";
                 $ckeditorPath = $this->ckeditorPath();
 
-                if (!empty($this->timestamp) && $this->timestamp != "%TIMESTAMP%") {
+                if (!empty($this->timestamp) && $this->timestamp != "%"."TIMESTAMP%") {
                         $args = '?t=' . $this->timestamp;
                 }
 
@@ -465 +465 @@
                         $extraCode .= ($extraCode ? "\n" : "") . "if (typeof(CKEDITOR) == 'undefined') { alert('The CKEDITOR object was not found. Please make sure that the ckeditor.js file is available in your installation.'); }";
                 }
                 // %REMOVE_END%
-                if (!empty($this->timestamp) && $this->timestamp != self::timestamp) {
+                if ($this->timestamp != self::timestamp) {
                         $extraCode .= ($extraCode ? "\n" : "") . "CKEDITOR.timestamp = '". $this->timestamp ."';";
                 }
                 if ($extraCode) {