The branch, master has been updated
via 07487b01b4cd7a7f48c83bc139538ccf17ca259c (commit)
from a7b1a56b28908a526a3b5ecdd001bf0648996869 (commit)
- Log -----------------------------------------------------------------
commit 07487b01b4cd7a7f48c83bc139538ccf17ca259c
Author: Michal Čihař <[email protected]>
Date: Thu Jul 21 13:18:46 2011 +0200
Coding style
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 12d40c2..4b9ae81 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -80,11 +80,10 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
$do_display['bkm_form'] = (string) '0';
$do_display['text_btn'] = (string) '0';
$do_display['pview_lnk'] = (string) '0';
- }
// 2.1 Statement is a "SELECT COUNT", a
// "CHECK/ANALYZE/REPAIR/OPTIMIZE", an "EXPLAIN" one or
// contains a "PROC ANALYSE" part
- elseif ($GLOBALS['is_count'] || $GLOBALS['is_analyse'] ||
$GLOBALS['is_maint'] || $GLOBALS['is_explain']) {
+ } elseif ($GLOBALS['is_count'] || $GLOBALS['is_analyse'] ||
$GLOBALS['is_maint'] || $GLOBALS['is_explain']) {
$do_display['edit_lnk'] = 'nn'; // no edit link
$do_display['del_lnk'] = 'nn'; // no delete link
$do_display['sort_lnk'] = (string) '0';
@@ -97,9 +96,8 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
$do_display['text_btn'] = (string) '0';
}
$do_display['pview_lnk'] = (string) '1';
- }
// 2.2 Statement is a "SHOW..."
- elseif ($GLOBALS['is_show']) {
+ } elseif ($GLOBALS['is_show']) {
/**
* 2.2.1
* @todo defines edit/delete links depending on show statement
@@ -120,11 +118,10 @@ function PMA_setDisplayMode(&$the_disp_mode, &$the_total)
$do_display['bkm_form'] = (string) '1';
$do_display['text_btn'] = (string) '1';
$do_display['pview_lnk'] = (string) '1';
- }
// 2.3 Other statements (ie "SELECT" ones) -> updates
// $do_display['edit_lnk'], $do_display['del_lnk'] and
// $do_display['text_btn'] (keeps other default values)
- else {
+ } else {
$prev_table = $fields_meta[0]->table;
$do_display['text_btn'] = (string) '1';
for ($i = 0; $i < $GLOBALS['fields_cnt']; $i++) {
@@ -310,7 +307,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev,
$sql_query, $id_for_di
$pageNow = @floor($_SESSION['tmp_user_values']['pos'] /
$_SESSION['tmp_user_values']['max_rows']) + 1;
$nbTotalPage = @ceil($unlim_num_rows /
$_SESSION['tmp_user_values']['max_rows']);
- if ($nbTotalPage > 1){ //if2
+ if ($nbTotalPage > 1) { //if2
?>
<td>
<?php
@@ -388,7 +385,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev,
$sql_query, $id_for_di
} // end move toward
// show separator if pagination happen
- if ($nbTotalPage > 1){
+ if ($nbTotalPage > 1) {
echo '<td><div class="navigation_separator">|</div></td>';
}
?>
hooks/post-receive
--
phpMyAdmin
------------------------------------------------------------------------------
5 Ways to Improve & Secure Unified Communications
Unified Communications promises greater efficiencies for business. UC can
improve internal communications as well as offer faster, more efficient ways
to interact with customers and streamline customer service. Learn more!
http://www.accelacomm.com/jaw/sfnl/114/51426253/
_______________________________________________
Phpmyadmin-git mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git
