[geeklog-cvs] geeklog: Removed checks for PHP 5 for the Webservices (feature r...

[geeklog-cvs at lists.geeklog.net]

changeset 8011:dd109f4a7362
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/dd109f4a7362
user: Dirk Haun <dirk at haun-online.de>
date: Sat Nov 06 13:01:00 2010 +0100
description:
Removed checks for PHP 5 for the Webservices (feature request #0001217)

diffstat:

 plugins/staticpages/services.inc.php |  3 +--
 system/lib-story.php                 |  3 +--
 system/lib-webservices.php           |  8 ++------
 3 files changed, 4 insertions(+), 10 deletions(-)

diffs (56 lines):

diff -r c90efd17bba8 -r dd109f4a7362 plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sat Nov 06 12:58:07 2010 +0100
+++ b/plugins/staticpages/services.inc.php	Sat Nov 06 13:01:00 2010 +0100
@@ -62,8 +62,7 @@
     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC,
            $_GROUPS, $_SP_CONF;
 
-    if (version_compare(PHP_VERSION, '5.0.0', '>=') &&
-            (! $_CONF['disable_webservices'])) {
+    if (! $_CONF['disable_webservices']) {
         require_once $_CONF['path_system'] . 'lib-webservices.php';
     }
 
diff -r c90efd17bba8 -r dd109f4a7362 system/lib-story.php
--- a/system/lib-story.php	Sat Nov 06 12:58:07 2010 +0100
+++ b/system/lib-story.php	Sat Nov 06 13:01:00 2010 +0100
@@ -1189,8 +1189,7 @@
     }
 
     require_once $_CONF['path_system'] . 'lib-comment.php';
-    if (version_compare(PHP_VERSION, '5.0.0', '>=') &&
-            (! $_CONF['disable_webservices'])) {
+    if (! $_CONF['disable_webservices']) {
         require_once $_CONF['path_system'] . 'lib-webservices.php';
     }
 
diff -r c90efd17bba8 -r dd109f4a7362 system/lib-webservices.php
--- a/system/lib-webservices.php	Sat Nov 06 12:58:07 2010 +0100
+++ b/system/lib-webservices.php	Sat Nov 06 13:01:00 2010 +0100
@@ -2,13 +2,13 @@
 
 /* Reminder: always indent with 4 spaces (no tabs). */
 // +---------------------------------------------------------------------------+
-// | Geeklog 1.6                                                               |
+// | Geeklog 1.8                                                               |
 // +---------------------------------------------------------------------------+
 // | lib-webservices.php                                                       |
 // |                                                                           |
 // | WS-related functions needed in more than one place.                       |
 // +---------------------------------------------------------------------------+
-// | Copyright (C) 2007-2009 by the following authors:                         |
+// | Copyright (C) 2007-2010 by the following authors:                         |
 // |                                                                           |
 // | Authors: Ramnath R Iyer        - rri AT silentyak DOT com                 |
 // |          Dirk Haun             - dirk AT haun-online DOT de               |
@@ -54,10 +54,6 @@
 // Set = true to enable verbose logging (in error.log)
 $WS_VERBOSE = false;
 
-/* Check for PHP5 */
-if (PHP_VERSION < 5) {
-    $_CONF['disable_webservices'] = true;
-}
 
 /**
  * Displays an error message with the appropriate HTTP error-code