[phpwiki-checkins] SF.net SVN: phpwiki:[10506] trunk/lib/WikiDB/backend

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

Revision: 10506
          http://sourceforge.net/p/phpwiki/code/10506
Author:   vargenau
Date:     2021-08-13 13:33:55 +0000 (Fri, 13 Aug 2021)
Log Message:
-----------
_tryroot_from_upgrade no longer used

Modified Paths:
--------------
    trunk/lib/WikiDB/backend/PDO.php
    trunk/lib/WikiDB/backend/PearDB.php

Modified: trunk/lib/WikiDB/backend/PDO.php
===================================================================
--- trunk/lib/WikiDB/backend/PDO.php	2021-08-13 08:32:19 UTC (rev 10505)
+++ trunk/lib/WikiDB/backend/PDO.php	2021-08-13 13:33:55 UTC (rev 10506)
@@ -107,11 +107,7 @@
                 echo "<br>\n_parsedDSN: '", print_r($this->_parsedDSN), "'";
                 echo "<br>\nparsed: '", print_r($parsed), "'";
             }
-            if (isset($dbparams['_tryroot_from_upgrade']))
-                trigger_error(sprintf("Can't connect to database: %s", $e->getMessage()),
-                    E_USER_WARNING);
-            else
-                exit();
+            exit();
         }
         if (DEBUG & _DEBUG_SQL) { // not yet implemented
             $this->_dbh->debug = true;

Modified: trunk/lib/WikiDB/backend/PearDB.php
===================================================================
--- trunk/lib/WikiDB/backend/PearDB.php	2021-08-13 08:32:19 UTC (rev 10505)
+++ trunk/lib/WikiDB/backend/PearDB.php	2021-08-13 13:33:55 UTC (rev 10506)
@@ -49,10 +49,7 @@
         if (DB::isError($dbh)) {
             trigger_error(sprintf("Can't connect to database: %s",
                     $this->_pear_error_message($dbh)),
-                isset($dbparams['_tryroot_from_upgrade']) // hack!
-                    ? E_USER_WARNING : E_USER_ERROR);
-            if (isset($dbparams['_tryroot_from_upgrade']))
-                return;
+                    E_USER_ERROR);
         }
         $dbh->setErrorHandling(PEAR_ERROR_CALLBACK,
             array($this, '_pear_error_callback'));

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