[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-9112-gf48846c

[Michal Čihař]

The branch, master has been updated
       via  f48846cbc048641c59805a2cbe11b17f76fc2119 (commit)
      from  ba9e74bb855deb71598d68081e92879820aaf0be (commit)


- Log -----------------------------------------------------------------
commit f48846cbc048641c59805a2cbe11b17f76fc2119
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Jul 18 10:18:31 2011 +0200

    Document why eval is used

-----------------------------------------------------------------------

Summary of changes:
 libraries/Config.class.php |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 1a678f0..942ee9e 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -350,7 +350,8 @@ class PMA_Config
         $cfg = array();
 
         /**
-         * Parses the configuration file
+         * Parses the configuration file, the eval is used here to avoid
+         * problems with trailing whitespace, what is often a problem.
          */
         $old_error_reporting = error_reporting(0);
         $eval_result = eval('?' . '>' . trim(file_get_contents($this->getSource())));


hooks/post-receive
-- 
phpMyAdmin