Changeset 1574

Timestamp:

2008-02-20 17:35:13 (8 months ago)

Author:

wwalc

Message:

Fix for #1815. Removed closing tags from main PHP files.

Location:

FCKeditor/trunk

Files:

• fckeditor.php (modified) (2 diffs)
• fckeditor_php4.php (modified) (1 diff)
• fckeditor_php5.php (modified) (1 diff)

FCKeditor/trunk/fckeditor.php

@@ -28 +28 @@
 function FCKeditor_IsCompatibleBrowser()
 {
-        global $HTTP_USER_AGENT ;
-
-        if ( !isset( $_SERVER ) ) {
+        if ( isset( $_SERVER ) ) {
+                $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
+        }
+        else {
                 global $HTTP_SERVER_VARS ;
-            $_SERVER = $HTTP_SERVER_VARS ;
+                if ( isset( $HTTP_SERVER_VARS ) ) {
+                        $sAgent = $HTTP_SERVER_VARS['HTTP_USER_AGENT'] ;
+                }
+                else {
+                        global $HTTP_USER_AGENT ;
+                        $sAgent = $HTTP_USER_AGENT ;
+                }
         }
-
-        if ( isset( $HTTP_USER_AGENT ) )
-                $sAgent = $HTTP_USER_AGENT ;
-        else
-                $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
-
+        
         if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
         {
@@ -68 +70 @@
 else
         include_once( 'fckeditor_php5.php' ) ;
-
-?>

FCKeditor/trunk/fckeditor_php4.php

@@ -142 +142 @@
         }
 }
-
-?>

FCKeditor/trunk/fckeditor_php5.php

@@ -137 +137 @@
         }
 }
-
-?>