[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17289-gfd118e0

[Dieter Adriaenssens]

The branch, master has been updated
       via  fd118e02d45cab28409e64837fdcc8367a5c9ce8 (commit)
       via  a805121a221b765612a7c7a346f0a6d773b502b4 (commit)
      from  fb5820487ca57f12b8a9a1b9ea21ecfeff12607e (commit)


- Log -----------------------------------------------------------------
commit fd118e02d45cab28409e64837fdcc8367a5c9ce8
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Thu Aug 25 22:03:08 2011 +0200

    try indentation

commit a805121a221b765612a7c7a346f0a6d773b502b4
Author: Dieter Adriaenssens <ruleant at users.sourceforge.net>
Date:   Thu Aug 25 22:00:32 2011 +0200

    fix DocCoding

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

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

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index b0d85a9..669bf32 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -179,19 +179,18 @@ class PMA_Config
         // (must check everything else before Mozilla)
 
         if (preg_match(
-                '@Opera(/| )([0-9].[0-9]{1,2})@',
-                $HTTP_USER_AGENT,
-                $log_version
-            )
+            '@Opera(/| )([0-9].[0-9]{1,2})@',
+            $HTTP_USER_AGENT,
+            $log_version
+        )
         ) {
             $this->set('PMA_USR_BROWSER_VER', $log_version[2]);
             $this->set('PMA_USR_BROWSER_AGENT', 'OPERA');
         } elseif (preg_match(
-                '@MSIE ([0-9].[0-9]{1,2})@',
-                $HTTP_USER_AGENT,
-                $log_version
-            )
-        ) {
+            '@MSIE ([0-9].[0-9]{1,2})@',
+            $HTTP_USER_AGENT,
+            $log_version
+        )) {
             $this->set('PMA_USR_BROWSER_VER', $log_version[1]);
             $this->set('PMA_USR_BROWSER_AGENT', 'IE');
         } elseif (preg_match(
@@ -613,10 +612,10 @@ class PMA_Config
      * If user preferences are not yet initialized, option is applied to global config and
      * added to a update queue, which is processed by {@link loadUserPreferences()}
      *
-     * @param string $cookie_name can be null
+     * @param string $cookie_name   can be null
      * @param string $cfg_path
-     * @param mixed  $new_cfg_value
-     * @param mixed  $default_value
+     * @param mixed  $new_cfg_value new value
+     * @param mixed  $default_value default value
      *
      * @return nothing
      */
@@ -645,8 +644,8 @@ class PMA_Config
     /**
      * Reads value stored by {@link setUserValue()}
      *
-     * @param string $cookie_name
-     * @param mixed $cfg_value
+     * @param string $cookie_name cookie name
+     * @param mixed  $cfg_value   config value
      *
      * @return mixed
      */
@@ -744,7 +743,7 @@ class PMA_Config
     /**
      * returns specific config setting
      *
-     * @param string $setting
+     * @param string $setting config setting
      *
      * @return mixed value
      */


hooks/post-receive
-- 
phpMyAdmin