cvs: pearweb /include pear-format-html.php

cellog Thu May 24 04:07:49 2007 UTC

Modified files:
/pearweb/include pear-format-html.php
Log:
we use APC - Cache_Lite is completely unnecessary for static files

# EXPERIMENTAL - please test

http://cvs.php.net/viewvc.cgi/pearwe...&diff_format=u
Index: pearweb/include/pear-format-html.php
diff -u pearweb/include/pear-format-html.php:1.211 pearweb/include/pear-format-html.php:1.212
--- pearweb/include/pear-format-html.php:1.211 Thu May 17 20:34:30 2007
+++ pearweb/include/pear-format-html.php Thu May 24 04:07:49 2007
@@ -15,7 +15,7 @@
+----------------------------------------------------------------------+
| Authors: |
+----------------------------------------------------------------------+
- $Id: pear-format-html.php,v 1.211 2007/05/17 20:34:30 wiesemann Exp $
+ $Id: pear-format-html.php,v 1.212 2007/05/24 04:07:49 cellog Exp $
*/

PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'error_handler');
@@ -29,11 +29,15 @@
return $extra_styles;
}

-// needed for error reporting handling in startup
-$GLOBALS['_NODB'] = true;
-require_once 'pear-cache.php';
-// $dbh is initialized in pear-cache
-$GLOBALS['_NODB'] = false;
+include_once 'DB.php';
+
+if (empty($dbh)) {
+ $options = array(
+ 'persistent' => false,
+ 'portability' => DB_PORTABILITY_ALL,
+ );
+ $dbh =& DB::connect(PEAR_DATABASE_DSN, $options);
+}

$self = htmlspecialchars($_SERVER['PHP_SELF']);