[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0RC2-654-gb2b1953 - Git

4 May 2011

The branch, master has been updated
       via  b2b1953db11219b5ac801ab58c3ecff2cfbb7f29 (commit)
      from  90845aa8cbec8788c92e48090a214ff89a2309b3 (commit)
- Log -----------------------------------------------------------------
commit b2b1953db11219b5ac801ab58c3ecff2cfbb7f29
Author: Marc Delisle marc@infomarc.info
Date:   Tue May 3 18:52:37 2011 -0400
Start to replace warning level with error level
-----------------------------------------------------------------------
Summary of changes:
 db_qbe.php             |    2 +-
 main.php               |    2 +-
 prefs_forms.php        |    4 ++--
 prefs_manage.php       |    2 +-
 server_privileges.php  |    2 +-
 server_replication.php |    6 +++---
 sql.php                |    2 +-
 tbl_indexes.php        |    2 +-
 tbl_relation.php       |    2 +-
 tbl_replace.php        |    2 +-
 10 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/db_qbe.php b/db_qbe.php
index 29b32f4..2319b82 100644
--- a/db_qbe.php
+++ b/db_qbe.php
@@ -35,7 +35,7 @@ if (isset($_REQUEST['submit_sql']) && ! empty($sql_query)) {
if (isset($_REQUEST['submit_sql'])
  && ! preg_match('@^SELECT@i', $sql_query)) {
-    PMA_Message::warning(__('You have to choose at least one column to display'))->display();
+    PMA_Message::error(__('You have to choose at least one column to display'))->display();
 }
diff --git a/main.php b/main.php
index 96f3e01..c7c25bc 100644
--- a/main.php
+++ b/main.php
@@ -305,7 +305,7 @@ if ($server > 0) {
 }
/**
- * Show warning when javascript support is missing.
+ * Show notice when javascript support is missing.
  */
 echo '<noscript>';
 $message = PMA_Message::notice(__('Javascript support is missing or disabled in your browser, some phpMyAdmin functionality will be missing. For example navigation frame will not refresh automatically.'));
diff --git a/prefs_forms.php b/prefs_forms.php
index 40ea171..22ffb4c 100644
--- a/prefs_forms.php
+++ b/prefs_forms.php
@@ -74,7 +74,7 @@ if ($error) {
 if ($form_display->hasErrors()) {
     // form has errors
     ?>
-    <div class="warning config-form">
+    <div class="error config-form">
         <b><?php echo __('Cannot save settings, submitted form contains errors') ?></b>
         <?php $form_display->displayErrors(); ?>
     </div>
@@ -86,4 +86,4 @@ $form_display->display(true, true);
  * Displays the footer
  */
 require './libraries/footer.inc.php';
-?>
\ No newline at end of file
+?>
diff --git a/prefs_manage.php b/prefs_manage.php
index 76ead89..e5dbe3f 100644
--- a/prefs_manage.php
+++ b/prefs_manage.php
@@ -109,7 +109,7 @@ if (isset($_POST['submit_export']) && filter_input(INPUT_POST, 'export_type') ==
             // mimic original form and post json in a hidden field
             require './libraries/header.inc.php';
             require './libraries/user_preferences.inc.php';
-            $msg = PMA_Message::warning(__('Configuration contains incorrect data for some fields.'));
+            $msg = PMA_Message::error(__('Configuration contains incorrect data for some fields.'));
             $msg->display();
             echo '<div class="config-form">';
             $form_display->displayErrors();
diff --git a/server_privileges.php b/server_privileges.php
index a9ebcd9..19f9dcb 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -1790,7 +1790,7 @@ if (empty($_REQUEST['adduser']) && (! isset($checkprivs) || ! strlen($checkprivs
         $user_does_not_exists = (bool) ! PMA_DBI_fetch_value($sql);
         unset($sql);
         if ($user_does_not_exists) {
-            PMA_Message::warning(__('The selected user was not found in the privilege table.'))->display();
+            PMA_Message::error(__('The selected user was not found in the privilege table.'))->display();
             PMA_displayLoginInformationFields();
             //require './libraries/footer.inc.php';
         }
diff --git a/server_replication.php b/server_replication.php
index a25fe1d..9b7724d 100644
--- a/server_replication.php
+++ b/server_replication.php
@@ -288,10 +288,10 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
         $slave_skip_error_link = PMA_generate_common_url($_url_params);
if ($server_slave_replication[0]['Slave_SQL_Running'] == 'No') {
-            PMA_Message::warning(__('Slave SQL Thread not running!'))->display();
+            PMA_Message::error(__('Slave SQL Thread not running!'))->display();
         }
         if ($server_slave_replication[0]['Slave_IO_Running'] == 'No') {
-            PMA_Message::warning(__('Slave IO Thread not running!'))->display();
+            PMA_Message::error(__('Slave IO Thread not running!'))->display();
         }
$_url_params = $GLOBALS['url_params'];
@@ -337,7 +337,7 @@ if (! isset($GLOBALS['repl_clear_scr'])) {
         echo ' </li>';
         echo ' <li><a href="#" id="slave_errormanagement_href">' . __('Error management:') . '</a>';
         echo ' <div id="slave_errormanagement_gui" style="display: none">';
-        PMA_Message::warning(__('Skipping errors might lead into unsynchronized master and slave!'))->display();
+        PMA_Message::error(__('Skipping errors might lead into unsynchronized master and slave!'))->display();
         echo '  <ul>';
         echo '   <li><a href="' . $slave_skip_error_link . '">' . __('Skip current error') . '</a></li>';
         echo '   <li>' . __('Skip next');
diff --git a/sql.php b/sql.php
index 9587d32..9b19174 100644
--- a/sql.php
+++ b/sql.php
@@ -275,7 +275,7 @@ if ($do_confirm) {
     $stripped_sql_query = $sql_query;
     require_once './libraries/header.inc.php';
     if ($is_drop_database) {
-        echo '<h1 class="warning">' . __('You are about to DESTROY a complete database!') . '</h1>';
+        echo '<h1 class="error">' . __('You are about to DESTROY a complete database!') . '</h1>';
     }
     echo '<form action="sql.php" method="post">' . "\n"
         .PMA_generate_common_hidden_inputs($db, $table);
diff --git a/tbl_indexes.php b/tbl_indexes.php
index 166c6aa..46e5e1c 100644
--- a/tbl_indexes.php
+++ b/tbl_indexes.php
@@ -179,7 +179,7 @@ if (isset($_REQUEST['create_index'])) {
<br class="clearfloat" />
 <?php
-PMA_Message::warning(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display();
+PMA_Message::error(__('("PRIMARY" <b>must</b> be the name of and <b>only of</b> a primary key!)'))->display();
 ?>
<table>
diff --git a/tbl_relation.php b/tbl_relation.php
index 68288e1..400fc63 100644
--- a/tbl_relation.php
+++ b/tbl_relation.php
@@ -273,7 +273,7 @@ if (isset($_REQUEST['destination_foreign'])) {
                 echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
             }
             if (substr($tmp_error, 1, 4) == '1005') {
-                $message = PMA_Message::warning( __('Error creating foreign key on %1$s (check data types)'));
+                $message = PMA_Message::error( __('Error creating foreign key on %1$s (check data types)'));
                 $message->addParam($master_field);
                 $message->display();
                 echo PMA_showMySQLDocu('manual_Table_types', 'InnoDB_foreign_key_constraints') . "\n";
diff --git a/tbl_replace.php b/tbl_replace.php
index ab8cd10..0abe124 100644
--- a/tbl_replace.php
+++ b/tbl_replace.php
@@ -410,7 +410,7 @@ $message->addMessages($last_messages, '<br />');
if (! empty($warning_messages)) {
     /**
-     * @todo use a <div class="warning"> in PMA_showMessage() for this part of
+     * @todo use a <div class="error"> in PMA_showMessage() for this part of
      * the message
      */
     $message->addMessages($warning_messages, '<br />');
hooks/post-receive
-- 
phpMyAdmin


    