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

Trim spaces from config file to avoid unwanted outpu (path #1431566, thanks to Piotr_Skowronek - piotr_skowronek).

Browse Source
This commit is contained in:
Michal Čihař
2006-02-21 17:44:38 +00:00
parent eb8874eec5
commit 03ca5b8846
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -10,6 +10,9 @@ $Source$
- Various bug fixes (bug #1435700, bug #1435806, undefined indexes). - Various bug fixes (bug #1435700, bug #1435806, undefined indexes).
- XHTML fixes (patch #1435772, thanks to Matt LaPlante - cyberdog3k). - XHTML fixes (patch #1435772, thanks to Matt LaPlante - cyberdog3k).
* libraries/export/sql.php: New line before values (RFE #1435919). * libraries/export/sql.php: New line before values (RFE #1435919).
* libraries/Config.class.php: Trim spaces from config file to avoid
unwanted outpu (path #1431566, thanks to Piotr_Skowronek -
piotr_skowronek).
2006-02-21 Sebastian Mendel <cybot_tm@users.sourceforge.net> 2006-02-21 Sebastian Mendel <cybot_tm@users.sourceforge.net>
* libraries/common.lib.php PMA_getUvaCondition(): * libraries/common.lib.php PMA_getUvaCondition():

4
libraries/Config.class.php
View File

@@ -348,10 +348,10 @@ class PMA_Config
$old_error_reporting = error_reporting(0); $old_error_reporting = error_reporting(0);
if ( function_exists('file_get_contents') ) { if ( function_exists('file_get_contents') ) {
$eval_result = $eval_result =
eval( '?>' . file_get_contents($this->getSource()) ); eval( '?>' . trim(file_get_contents($this->getSource())) );
} else { } else {
$eval_result = $eval_result =
eval( '?>' . implode('\n', file($this->getSource())) ); eval( '?>' . trim(implode('\n', file($this->getSource()))) );
} }
error_reporting($old_error_reporting); error_reporting($old_error_reporting);