[geeklog-cvs] geeklog: Another attempt to fix a compatibility issue with PHP 4...

[geeklog-cvs at lists.geeklog.net]

details:   http://project.geeklog.net/cgi-bin/hgweb.cgi/rev/83f7e21538e1
changeset: 7138:83f7e21538e1
user:      Dirk Haun <dirk at haun-online.de>
date:      Sun Jun 21 09:34:35 2009 +0200
description:
Another attempt to fix a compatibility issue with PHP 4 (parse error when saving a static page). Thanks to Ben for testing.

diffstat:

 plugins/staticpages/services.inc.php |  3 ++-
 public_html/docs/history             |  4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diffs (33 lines):

diff -r 195d4ef428df -r 83f7e21538e1 plugins/staticpages/services.inc.php
--- a/plugins/staticpages/services.inc.php	Sun Jun 21 09:04:01 2009 +0200
+++ b/plugins/staticpages/services.inc.php	Sun Jun 21 09:34:35 2009 +0200
@@ -62,7 +62,8 @@
     global $_CONF, $_TABLES, $_USER, $LANG_ACCESS, $LANG12, $LANG_STATIC,
            $LANG_LOGIN, $_GROUPS, $_SP_CONF;
 
-    if ((PHP_VERSION > 4) && (! $_CONF['disable_webservices'])) {
+    if (version_compare(PHP_VERSION, '5.0.0', '>=') &&
+            (! $_CONF['disable_webservices'])) {
         require_once $_CONF['path_system'] . '/lib-webservices.php';
     }
 
diff -r 195d4ef428df -r 83f7e21538e1 public_html/docs/history
--- a/public_html/docs/history	Sun Jun 21 09:04:01 2009 +0200
+++ b/public_html/docs/history	Sun Jun 21 09:34:35 2009 +0200
@@ -1,6 +1,6 @@
 Geeklog History/Changes:
 
-Jun 2?, 2009 (1.6.0b3)
+Jun 21, 2009 (1.6.0b3)
 ------------
 
 Geeklog 1.6.0 incorporates the following projects implemented during
@@ -47,6 +47,8 @@
 
 Static Pages plugin
 -------------------
+- Another attempt to fix a compatibility issue with PHP 4 (parse error)
+  [Ben, Dirk]
 - Implemented PLG_getCommentUrlId [Dirk]
 - Update static pages comments when changing a page's ID so the comments don't
   become orphaned (part of bug #0000901) [Dirk]