alex Wed Jul 25 13:58:58 2001 EDT
Modified files:
/r2/binarycloud/base/core Makefile
/r2/binarycloud/base/init Init.php
Log:
Modified Init to start up PEAR, and PEAR_Error. Note that $PEAR exists as a global - but PEAR_Error
does not - use $Err.
Index: r2/binarycloud/base/core/Makefile
diff -u r2/binarycloud/base/core/Makefile:1.5 r2/binarycloud/base/core/Makefile:1.6
--- r2/binarycloud/base/core/Makefile:1.5 Sat Jul 14 19:03:12 2001
+++ r2/binarycloud/base/core/Makefile Wed Jul 25 13:58:13 2001
@@ -1,5 +1,5 @@
# {{{ Header
-# -File $Id: Makefile,v 1.5 2001/07/15 02:03:12 alex Exp $
+# -File $Id: Makefile,v 1.6 2001/07/25 20:58:13 alex Exp $
# -License LGPL (http://www.gnu.org/copyleft/lesser.html)
# -Copyright 2001, Intacct Corp.
# -Author odysseas tsatalos, ody...@ya...
@@ -11,7 +11,6 @@
Auth.php \
Debug.php \
Lang.php \
- PEAR_Error.php \
Page.php \
Perm.php \
Sess.php \
Index: r2/binarycloud/base/init/Init.php
diff -u r2/binarycloud/base/init/Init.php:1.33 r2/binarycloud/base/init/Init.php:1.34
--- r2/binarycloud/base/init/Init.php:1.33 Tue Jul 10 14:31:47 2001
+++ r2/binarycloud/base/init/Init.php Wed Jul 25 13:58:58 2001
@@ -1,7 +1,7 @@
<?php
// Header {{{
/*******************************************************************************
- ** -File $Id: Init.php,v 1.33 2001/07/10 21:31:47 alex Exp $
+ ** -File $Id: Init.php,v 1.34 2001/07/25 20:58:58 alex Exp $
** -License LGPL (http://www.gnu.org/copyleft/lesser.html)
** -Copyright 2001, The Turing Studio, Inc.
** -Author alex black, en...@tu...
@@ -67,7 +67,7 @@
$this->_load_lang();
$this->_set_system_constants();
$this->_set_ini();
- $this->_load_error();
+ $this->_load_pear();
$this->_load_auth();
$this->_load_perm();
$this->_load_page();
@@ -236,27 +236,23 @@
}
// }}}
- // {{{ _load_error
+ // {{{ _load_pear
/**
- * This method loads the PEAR_Error class and creates a new instance
- * of it in $Err. It then includes the binarycloud Error Handler, which
- * automatically logs all php errors to the bc_errors table in the default
- * datasource.
+ * This method loads the PEAR class and creates a new instance
+ * of it.
*
* @author alex black, en...@tu...
* @return always returns true.
* @access private
*/
- function _load_error() {
- import('binarycloud.core.PEAR_Error');
+ function _load_pear() {
+ import('ext.pear.PEAR');
+ global $PEAR;
global $Err;
-
-// $Err = new PEAR_Error();
-
-// import('binarycloud.core.error_handler');
-// set_error_handler("Error_Handler");
+ $PEAR = new PEAR();
+ $Err = new PEAR_Error();
return true;
}
|