]>
Commit | Line | Data |
---|---|---|
3e2d669e ER |
1 | unchanged: |
2 | --- adodb-4.67/adodb.inc.php~ 2006-03-12 18:15:54.000000000 +0200 | |
3 | +++ adodb/adodb.inc.php 2006-03-12 18:26:52.000000000 +0200 | |
4 | @@ -44,7 +44,7 @@ | |
5 | * Set ADODB_DIR to the directory where this file resides... | |
6 | * This constant was formerly called $ADODB_RootPath | |
7 | */ | |
8 | - if (!defined('ADODB_DIR')) define('ADODB_DIR',dirname(__FILE__)); | |
9 | + if (!defined('ADODB_DIR')) define('ADODB_DIR','/usr/share/php/adodb'); | |
10 | ||
11 | //============================================================================================== | |
12 | // GLOBAL VARIABLES | |
13 | --- ./pear/Auth/Container/ADOdb.php 2006-03-12 17:42:27.000000000 +0200 | |
14 | +++ /usr/share/pear/Auth/Container/ADOdb.php 2006-03-12 18:34:11.000000000 +0200 | |
15 | @@ -21,9 +21,13 @@ | |
16 | // | |
17 | ||
18 | require_once 'Auth/Container.php'; | |
19 | -require_once 'adodb.inc.php'; | |
20 | -require_once 'adodb-pear.inc.php'; | |
21 | -require_once 'adodb-errorpear.inc.php'; | |
22 | + | |
23 | +if (!defined('ADODB_DIR')) { | |
24 | + define('ADODB_DIR', '/usr/share/php/adodb'); | |
25 | +} | |
26 | +require_once ADODB_DIR . '/adodb.inc.php'; | |
27 | +require_once ADODB_DIR . '/adodb-pear.inc.php'; | |
28 | +require_once ADODB_DIR . '/adodb-errorpear.inc.php'; | |
29 | ||
30 | /** | |
31 | * Storage driver for fetching login data from a database using ADOdb-PHP. | |
32 | @@ -404,12 +406,2 @@ | |
33 | } | |
34 | - | |
35 | -function showDbg( $string ) { | |
36 | - print " | |
37 | --- $string</P>"; | |
38 | -} | |
39 | -function dump( $var, $str, $vardump = false ) { | |
40 | - print "<H4>$str</H4><pre>"; | |
41 | - ( !$vardump ) ? ( print_r( $var )) : ( var_dump( $var )); | |
42 | - print "</pre>"; | |
43 | -} | |
44 | ?> | |
45 | unchanged: | |
46 | --- adodb/adodb-pear.inc.php 2006-03-12 18:07:56.000000000 +0200 | |
47 | +++ /usr/share/php/adodb/adodb-pear.inc.php 2006-03-12 18:32:20.000000000 +0200 | |
48 | @@ -43,10 +43,13 @@ | |
49 | free | |
50 | */ | |
51 | ||
52 | -define('ADODB_PEAR',dirname(__FILE__)); | |
53 | -include_once "PEAR.php"; | |
54 | -include_once ADODB_PEAR."/adodb-errorpear.inc.php"; | |
55 | -include_once ADODB_PEAR."/adodb.inc.php"; | |
56 | +include_once 'PEAR.php'; | |
57 | + | |
58 | +if (!defined('ADODB_DIR')) { | |
59 | + define('ADODB_DIR', '/usr/share/php/adodb'); | |
60 | +} | |
61 | +include_once ADODB_DIR . '/adodb-errorpear.inc.php'; | |
62 | +include_once ADODB_DIR . '/adodb.inc.php'; | |
63 | ||
64 | if (!defined('DB_OK')) { | |
65 | define("DB_OK", 1); |