nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feature to stop developers commiting their config.inc.php3 so easily.

Browse Source 
.cvsignore: 'config.inc.developer.php3' added
libraries/common.lib.php3: added include for 'config.inc.developer.php3'
This commit is contained in:
Robin Johnson
2002-05-10 09:46:20 +00:00
parent 6f69e17c73
commit c07e167017
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@@ -1 +1,2 @@
ChangeLog_till_2.2.6.tar.gz ChangeLog_till_2.2.6.tar.gz
config.inc.developer.php3

4
ChangeLog
View File

@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$ $Id$
$Source$ $Source$
2002-05-09 Robin Johnson <robbat2@users.sourceforge.net>
* .cvsignore, libraries/common.lib.php3: Feature to stop developers
commiting their config.inc.php3 so easily.
2002-05-09 Alexander M. Turek <rabus@users.sourceforge.net> 2002-05-09 Alexander M. Turek <rabus@users.sourceforge.net>
* left.php3, libraries/common.lib.php3: * left.php3, libraries/common.lib.php3:
Fixed bug #546011 (Navigation tooltips). Fixed bug #546011 (Navigation tooltips).

16
libraries/common.lib.php3
View File

@@ -63,16 +63,19 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
$pos = 0; $pos = 0;
} }
/** /**
* Parses the configuration file and gets some constants used to define * Parses the configuration file and gets some constants used to define
* versions of phpMyAdmin/php/mysql... * versions of phpMyAdmin/php/mysql...
*/ */
include('./config.inc.php3'); include('./config.inc.php3');
// For compatibility with old config.inc.php3 /**
if (!isset($cfg)) { * Reads in the developer edition config file. This is used exclusively during
include('./config_import.inc.php3'); * the development cycle of PMA, to prevent the accident of the developers ever
* submitting their config.inc.php3 file.
*/
if (file_exists('./config.inc.developer.php3')) {
include('./config.inc.developer.php3');
} }
/** /**
@@ -84,6 +87,11 @@ if (!defined('PMA_COMMON_LIB_INCLUDED')){
*/ */
include('./libraries/defines.lib.php3'); include('./libraries/defines.lib.php3');
// For compatibility with old config.inc.php3
if (!isset($cfg)) {
include('./config_import.inc.php3');
}
// If zlib output compression is set in the php configuration file, no // If zlib output compression is set in the php configuration file, no
// output buffering should be run // output buffering should be run
if (PMA_PHP_INT_VERSION < 40000 if (PMA_PHP_INT_VERSION < 40000