[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1903-g47a5cfe

Michal Čihař nijel at users.sourceforge.net
Tue Feb 8 15:30:40 CET 2011


The branch, master has been updated
       via  47a5cfe7c74a769d9da25d038b41e8b82239a3d1 (commit)
       via  72165d9c9dd38b6c5775c9418e2999a291442e5c (commit)
      from  ae44d8b1133298ec5f9fd0142492c15c41713ded (commit)


- Log -----------------------------------------------------------------
commit 47a5cfe7c74a769d9da25d038b41e8b82239a3d1
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Feb 8 15:30:02 2011 +0100

    Add missing subheader

commit 72165d9c9dd38b6c5775c9418e2999a291442e5c
Author: Michal Čihař <mcihar at novell.com>
Date:   Tue Feb 8 15:28:29 2011 +0100

    Use same icon as is used in links

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

Summary of changes:
 server_binlog.php      |    2 +-
 server_processlist.php |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/server_binlog.php b/server_binlog.php
index a499dab..df41b97 100644
--- a/server_binlog.php
+++ b/server_binlog.php
@@ -92,7 +92,7 @@ if (empty($_REQUEST['dontlimitchars'])) {
  * Displays the sub-page heading
  */
 echo '<h2>' . "\n"
-   . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '')
+   . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_tbl.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '')
    . '    ' . __('Binary log') . "\n"
    . '</h2>' . "\n";
 
diff --git a/server_processlist.php b/server_processlist.php
index 0bfb5c2..1e31021 100644
--- a/server_processlist.php
+++ b/server_processlist.php
@@ -14,6 +14,14 @@ require './libraries/server_links.inc.php';
 
 
 /**
+ * Displays the sub-page heading
+ */
+echo '<h2>' . "\n"
+   . ($GLOBALS['cfg']['MainPageIconic'] ? '<img src="' . $pmaThemeImage . 's_process.png" width="16" height="16" border="0" hspace="2" align="middle" alt="" />' : '')
+   . '    ' . __('Processes') . "\n"
+   . '</h2>' . "\n";
+
+/**
  * Kills a selected process
  */
 if (!empty($_REQUEST['kill'])) {


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list