[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_7-21573-g999e85b - Git

25 Oct 2011

The branch, master has been updated
       via  999e85b505b57c58e397ea967e4333f6fa38b57a (commit)
      from  b7c1742809dd045a4475697ee45d78cb0392a8ec (commit)
- Log -----------------------------------------------------------------
commit 999e85b505b57c58e397ea967e4333f6fa38b57a
Author: Michal Čihař mcihar@suse.cz
Date:   Tue Oct 25 11:17:56 2011 +0200
Coding style, documentation
-----------------------------------------------------------------------
Summary of changes:
 libraries/database_interface.lib.php |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php
index 6b26f18..4fcdfcf 100644
--- a/libraries/database_interface.lib.php
+++ b/libraries/database_interface.lib.php
@@ -10,13 +10,20 @@ if (! defined('PHPMYADMIN')) {
 }
/**
- *
+ * Force STORE_RESULT method, ignored by classic MySQL.
+ */
+define('PMA_DBI_QUERY_STORE',       1);
+/**
+ * Do not read whole query.
+ */
+define('PMA_DBI_QUERY_UNBUFFERED',  2);
+/**
+ * Get session variable.
  */
-// PMA_DBI_try_query()
-define('PMA_DBI_QUERY_STORE',       1);  // Force STORE_RESULT method, ignored by classic MySQL.
-define('PMA_DBI_QUERY_UNBUFFERED',  2);  // Do not read whole query
-// PMA_DBI_get_variable()
 define('PMA_DBI_GETVAR_SESSION',    1);
+/**
+ * Get global variable.
+ */
 define('PMA_DBI_GETVAR_GLOBAL',     2);
/**
@@ -48,7 +55,11 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) {
      * @todo add different messages for alternative extension
      * and complete fail (no alternative extension too)
      */
-    PMA_warnMissingExtension($GLOBALS['cfg']['Server']['extension'], false, PMA_showDocu('faqmysql'));
+    PMA_warnMissingExtension(
+        $GLOBALS['cfg']['Server']['extension'],
+        false,
+        PMA_showDocu('faqmysql')
+        );
if ($GLOBALS['cfg']['Server']['extension'] === 'mysql') {
         $alternativ_extension = 'mysqli';
@@ -58,7 +69,11 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) {
if (! PMA_DBI_checkDbExtension($alternativ_extension)) {
         // if alternative fails too ...
-        PMA_warnMissingExtension($GLOBALS['cfg']['Server']['extension'], true, PMA_showDocu('faqmysql'));
+        PMA_warnMissingExtension(
+            $GLOBALS['cfg']['Server']['extension'],
+            true,
+            PMA_showDocu('faqmysql')
+            );
     }
$GLOBALS['cfg']['Server']['extension'] = $alternativ_extension;
@@ -68,7 +83,8 @@ if (! PMA_DBI_checkDbExtension($GLOBALS['cfg']['Server']['extension'])) {
 /**
  * Including The DBI Plugin
  */
-require_once './libraries/dbi/' . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php';
+require_once './libraries/dbi/'
+    . $GLOBALS['cfg']['Server']['extension'] . '.dbi.lib.php';
/**
  * runs a query
hooks/post-receive
-- 
phpMyAdmin


    