Changeset 1017

Timestamp:

03/20/2008 05:47:00 PM (16 months ago)

Author:

BrianKoontz

Message:

Tested all error branches; minor fix to PHP_OS check. Refs
#381, #562

Files:

• branches/1.1.6.4/actions/checkversion.php (modified) (3 diffs)

branches/1.1.6.4/actions/checkversion.php

@@ -46 +46 @@
         
         // Attempt to get latest_wikka_version.txt
-        // The action won't work on Windows PHP 4.3.0 or less
+        // The action won't work on Windows PHP <4.3.0
         $timeout = CHECKVERSION_CONNECTION_TIMEOUT;
-        if (TRUE === strpos(strtolower(PHP_OS), 'windows'))
+        if (FALSE !== strpos(strtolower(PHP_OS), 'windows') &&
+        TRUE === version_compare(PHP_VERSION, '4.3.0', '<'))
         {
                 if ($vars['display'] == "debug")
                 {
-                        echo '<span class="debug">[Windows PHP does not support this feature]</span>'."\n";
-                }
-                return;
-        }
-        else if (FALSE === version_compare(PHP_VERSION, '4.3.0', '>='))
-        {
-                if ($vars['display'] == "debug")
-                {
-                        echo '<span class="debug">[PHP < 4.3.0 does not support this feature]</span>'."\n";
+                        echo '<span class="debug">['.PHP_OS.' PHP '.PHP_VERSION.' does not support this feature]</span>'."\n";
                 }
                 return;
@@ -72 +65 @@
                                 echo '<span class="debug">[allow_url_fopen disabled]</span>'."\n";
                         }
+                        return;
                 }
                 else
@@ -93 +87 @@
                                         echo '<span class="debug">[Cannot initiate socket connection]</span>'."\n";
                                 }
-                                // Return gracefully on error
                                 return;
                         }