[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15026-g35401e0

[Michal Čihař]

The branch, master has been updated
       via  35401e093c9613b9d1afe85f2acd28140acf1031 (commit)
      from  13c3beb8ef72808818744aee2994bb3ae7528c5f (commit)


- Log -----------------------------------------------------------------
commit 35401e093c9613b9d1afe85f2acd28140acf1031
Author: Michal Čihař <michal at cihar.com>
Date:   Mon Aug 15 17:55:53 2011 +0200

    Can not have <p> inside <p>

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

Summary of changes:
 server_status.php |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/server_status.php b/server_status.php
index 7d6e62a..9eb493c 100644
--- a/server_status.php
+++ b/server_status.php
@@ -1517,9 +1517,8 @@ function printMonitor()
             <?php
                 echo '<strong>';
                 echo __('Please note:');
-                echo '</strong><p>';
+                echo '</strong><br />';
                 echo __('Enabling the general_log may increase the server load by 5-15%. Also be aware that generating statistics from the logs is a load intensive task, so it is advisable to select only a small time span and to disable the general_log and empty its table once monitoring is not required any more.');
-                echo '</p>';
             ?>
             </p>
         </div>


hooks/post-receive
-- 
phpMyAdmin