[phpwiki-checkins] SF.net SVN: phpwiki:[8034] trunk

[<var...@us...>]

Revision: 8034
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=8034&view=rev
Author:   vargenau
Date:     2011-04-11 09:22:33 +0000 (Mon, 11 Apr 2011)

Log Message:
-----------
We assume PHP >= 4.3.9, so dba_handlers exists

Modified Paths:
--------------
    trunk/configurator.php
    trunk/lib/DbaDatabase.php

Modified: trunk/configurator.php
===================================================================
--- trunk/configurator.php	2011-04-11 08:56:56 UTC (rev 8033)
+++ trunk/configurator.php	2011-04-11 09:22:33 UTC (rev 8034)
@@ -723,7 +723,7 @@
                     'db3'  => "DB3 - BerkeleyDB (Sleepycat) DB3. Default on Windows but not on every Linux",
                     'db4'  => "DB4 - BerkeleyDB (Sleepycat) DB4."), "
 Use 'gdbm', 'dbm', 'db2', 'db3' or 'db4' depending on your DBA handler methods supported: <br />  "
-                      . (function_exists("dba_handlers") ? join(", ",dba_handlers()) : "")
+                      . join(", ",dba_handlers())
                       . "\n\nBetter not use other hacks such as inifile, flatfile or cdb");
 
 $properties["dba timeout"] =

Modified: trunk/lib/DbaDatabase.php
===================================================================
--- trunk/lib/DbaDatabase.php	2011-04-11 08:56:56 UTC (rev 8033)
+++ trunk/lib/DbaDatabase.php	2011-04-11 09:22:33 UTC (rev 8034)
@@ -14,14 +14,12 @@
         $this->_handler = $handler;
         $this->_timeout = DBA_DATABASE_DEFAULT_TIMEOUT;
         $this->_dbh = false;
-        if (function_exists("dba_handlers")) { // since php-4.3.0
-            if (!in_array($handler, dba_handlers()))
-                $this->_error(
-                    sprintf(
-                        _("The DBA handler %s is unsupported!")."\n".
-                            _("Supported handlers are: %s"),
-                            $handler, join(",",dba_handlers())));
-        }
+        if (!in_array($handler, dba_handlers()))
+            $this->_error(
+                sprintf(
+                    _("The DBA handler %s is unsupported!")."\n".
+                        _("Supported handlers are: %s"),
+                         $handler, join(",",dba_handlers())));
         $this->readonly = false;
         if ($mode)
             $this->open($mode);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.