]>
Commit | Line | Data |
---|---|---|
4077907c ER |
1 | --- phpPgAdmin-4.0.1/libraries/lib.inc.php~ 2005-12-02 17:19:47.000000000 +0200 |
2 | +++ phpPgAdmin-4.0.1/libraries/lib.inc.php 2005-12-02 17:24:01.259851274 +0200 | |
3 | @@ -26,12 +26,12 @@ | |
4 | exit(sprintf('Version of PHP not supported. Please upgrade to version %s or later.', $phpMinVer)); | |
5 | ||
6 | // Check to see if the configuration file exists, if not, explain | |
7 | - if (file_exists('conf/config.inc.php')) { | |
8 | + if (file_exists('/etc/webapps/phpPgAdmin/config.inc.php')) { | |
9 | $conf = array(); | |
10 | - include('./conf/config.inc.php'); | |
11 | + include('/etc/webapps/phpPgAdmin/config.inc.php'); | |
12 | } | |
13 | else { | |
14 | - echo 'Configuration error: Copy conf/config.inc.php-dist to conf/config.inc.php and edit appropriately.'; | |
15 | + echo 'Configuration error: Copy conf/config.inc.php-dist to /etc/webapps/phpPgAdmin/config.inc.php and edit appropriately.'; | |
16 | exit; | |
17 | } | |
d14a8f31 | 18 | |
4077907c ER |
19 | --- phpPgAdmin-4.0.1/classes/plugins/Plugin.php~ 2005-06-16 17:40:12.000000000 +0300 |
20 | +++ phpPgAdmin-4.0.1/classes/plugins/Plugin.php 2005-12-02 17:25:54.525481589 +0200 | |
21 | @@ -21,7 +21,7 @@ | |
22 | // Read in configuration | |
23 | if ($this->config !== null) { | |
24 | global $conf; | |
25 | - include('./conf/' . $name . '.inc.php'); | |
26 | + include('/etc/webapps/phpPgAdmin/' . $name . '.inc.php'); | |
27 | } | |
28 | } | |
29 | ||
237d75b9 ER |
30 | --- phpPgAdmin-4.0.1/libraries/lib.inc.php 2005-12-02 17:38:56.000000000 +0200 |
31 | +++ phpPgAdmin-4.0.1-org/libraries/lib.inc.php 2005-12-02 17:37:20.000000000 +0200 | |
32 | @@ -9,7 +9,7 @@ | |
33 | include_once('./lang/translations.php'); | |
34 | ||
35 | // Set error reporting level to max | |
36 | - error_reporting(E_ALL); | |
37 | + error_reporting(E_ALL & ~E_NOTICE); | |
0bb50a65 | 38 | ini_set('display_errors', 'on'); |
237d75b9 ER |
39 | |
40 | // Application name | |
d14a8f31 | 41 |