[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-9111-gba9e74b

[Michal Čihař]

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


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

    Function file_get_contents is available since PHP 4.3.0, no need to check for it

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

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 9c7ab48..1a678f0 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -353,13 +353,7 @@ class PMA_Config
          * Parses the configuration file
          */
         $old_error_reporting = error_reporting(0);
-        if (function_exists('file_get_contents')) {
-            $eval_result =
-                eval('?' . '>' . trim(file_get_contents($this->getSource())));
-        } else {
-            $eval_result =
-                eval('?' . '>' . trim(implode("\n", file($this->getSource()))));
-        }
+        $eval_result = eval('?' . '>' . trim(file_get_contents($this->getSource())));
         error_reporting($old_error_reporting);
 
         if ($eval_result === false) {


hooks/post-receive
-- 
phpMyAdmin