Merge remote-tracking branch 'origin/master'

2012-06-17 14:31:48 +02:00 · 2012-06-17 14:31:48 +02:00 · 459d3e8e4c
commit 459d3e8e4c
parent af9772e0a6 bd3cf8cda8
1 changed files with 2 additions and 1 deletions
--- a/libraries/File.class.php
+++ b/libraries/File.class.php
@ -159,7 +159,8 @@ class PMA_File
    /**
     * Gets file content
     *
-     * @return string  binary file content
+     * @return mixed   the binary file content as a string,
+     *                 or false if no content 
     *
     * @access  public
     */