[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-13635-g9204ae8

Michal Čihař nijel at users.sourceforge.net
Mon Aug 8 17:55:54 CEST 2011


The branch, master has been updated
       via  9204ae8594fe4d0e96bc18e20aecb5d0ea3cdef0 (commit)
       via  71f627307a391cb0f838bf9a8aba34a44696cadf (commit)
       via  94a9f4555a4ce71be71c9c8f367241a7ba2b65f9 (commit)
      from  96be56ea40007aff24f47d8d517eff5fd0bb7220 (commit)


- Log -----------------------------------------------------------------
commit 9204ae8594fe4d0e96bc18e20aecb5d0ea3cdef0
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Aug 8 17:55:20 2011 +0200

    Adjust calling indentation

commit 71f627307a391cb0f838bf9a8aba34a44696cadf
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Aug 8 17:55:15 2011 +0200

    This really should be private

commit 94a9f4555a4ce71be71c9c8f367241a7ba2b65f9
Author: Michal Čihař <mcihar at suse.cz>
Date:   Mon Aug 8 17:53:40 2011 +0200

    Adjust calling indentation

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

Summary of changes:
 browse_foreigners.php             |   27 ++++++++++++++-------------
 libraries/Theme_Manager.class.php |   16 +++++++++++-----
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/browse_foreigners.php b/browse_foreigners.php
index c31d74c..1a81504 100644
--- a/browse_foreigners.php
+++ b/browse_foreigners.php
@@ -59,16 +59,16 @@ if (is_array($foreignData['disp_row'])) {
 
     if ($foreignData['the_total'] > $GLOBALS['cfg']['MaxRows']) {
         $gotopage = PMA_pageselector(
-                      $session_max_rows,
-                      $pageNow,
-                      $nbTotalPage,
-                      200,
-                      5,
-                      5,
-                      20,
-                      10,
-                      __('Page number:')
-                    );
+            $session_max_rows,
+            $pageNow,
+            $nbTotalPage,
+            200,
+            5,
+            5,
+            20,
+            10,
+            __('Page number:')
+            );
     }
 }
 ?>
@@ -220,9 +220,10 @@ if (is_array($foreignData['disp_row'])) {
         } else {
             $val_ordered_current_val_title =
                 htmlspecialchars($val_ordered_current_val);
-            $val_ordered_current_val =
-                htmlspecialchars(PMA_substr($val_ordered_current_val, 0,
-                    $cfg['LimitChars']) . '...');
+            $val_ordered_current_val = htmlspecialchars(
+                PMA_substr($val_ordered_current_val, 0, $cfg['LimitChars'])
+                . '...'
+                );
         }
         if (PMA_strlen($key_ordered_current_val) <= $cfg['LimitChars']) {
             $key_ordered_current_val = htmlspecialchars($key_ordered_current_val);
diff --git a/libraries/Theme_Manager.class.php b/libraries/Theme_Manager.class.php
index d6c4ea0..eac54ef 100644
--- a/libraries/Theme_Manager.class.php
+++ b/libraries/Theme_Manager.class.php
@@ -106,9 +106,12 @@ class PMA_Theme_Manager
 
         if (! $this->checkTheme($GLOBALS['cfg']['ThemeDefault'])) {
             trigger_error(
-                sprintf(__('Default theme %s not found!'),
-                    htmlspecialchars($GLOBALS['cfg']['ThemeDefault'])),
-                E_USER_ERROR);
+                sprintf(
+                    __('Default theme %s not found!'),
+                    htmlspecialchars($GLOBALS['cfg']['ThemeDefault'])
+                    ),
+                E_USER_ERROR
+                );
             $GLOBALS['cfg']['ThemeDefault'] = false;
         }
 
@@ -144,7 +147,10 @@ class PMA_Theme_Manager
     {
         if (! $this->checkTheme($theme)) {
             trigger_error(
-                sprintf(__('Theme %s not found!'), htmlspecialchars($theme)),
+                sprintf(
+                    __('Theme %s not found!'),
+                    htmlspecialchars($theme)
+                ),
                 E_USER_ERROR);
             return false;
         }
@@ -203,7 +209,7 @@ class PMA_Theme_Manager
      * @param string $folder
      * @return  boolean
      */
-    /*private*/ function _checkThemeFolder($folder)
+    private function _checkThemeFolder($folder)
     {
         if (! is_dir($folder)) {
             trigger_error(


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list