The branch, master has been updated via b4b9b34ec53e9b4930856a4ece9dc213642661c2 (commit) from 336e8dfaa6b5184bdb00aedc101b9a8163f49160 (commit)

- Log ----------------------------------------------------------------- commit b4b9b34ec53e9b4930856a4ece9dc213642661c2 Author: Dieter Adriaenssens ruleant@users.sourceforge.net Date: Tue Nov 29 21:39:31 2011 +0100

clarify function descriptions

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

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php index a806dfa..2d4b978 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -1068,6 +1068,10 @@ class PMA_Config /** * Checks if protocol is https * + * This function checks if the https protocol is used in the PmaAbsoluteUri + * configuration setting, as opposed to detectHttps() which checks if the + * https protocol is used on the active connection. + * * @return bool */ public function isHttps() @@ -1092,6 +1096,8 @@ class PMA_Config /** * Detects whether https appears to be used. * + * This function checks if the https protocol is used in the current connection + * with the webserver, based on environment variables. * Please note that this just detects what we see, so * it completely ignores things like reverse proxies. *

hooks/post-receive