From a567a78b7f55046a821bbd386cf59e1a92a32d5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <mcihar@suse.cz>
Date: Wed, 5 Sep 2012 14:37:21 +0200
Subject: [PATCH] Drop deprecated [i] from bbcode support

---
 libraries/sanitizing.lib.php      | 2 --
 server_privileges.php             | 2 +-
 test/classes/PMA_Message_test.php | 4 ++--
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 0242e445e8..a71292cf86 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -97,8 +97,6 @@ function PMA_sanitize($message, $escape = false, $safe = false)
     }
     /* Interpret bb code */
     $replace_pairs = array(
-        '[i]'       => '<em>',      // deprecated by em
-        '[/i]'      => '</em>',     // deprecated by em
         '[em]'      => '<em>',
         '[/em]'     => '</em>',
         '[b]'       => '<strong>',  // deprecated by strong
diff --git a/server_privileges.php b/server_privileges.php
index 106685d1e3..05e0dfeb7a 100644
--- a/server_privileges.php
+++ b/server_privileges.php
@@ -213,7 +213,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
         . " AND `Host` = '" . $common_functions->sqlAddSlashes($hostname) . "';";
     if (PMA_DBI_fetch_value($sql) == 1) {
         $message = PMA_Message::error(__('The user %s already exists!'));
-        $message->addParam('[i]\'' . $username . '\'@\'' . $hostname . '\'[/i]');
+        $message->addParam('[em]\'' . $username . '\'@\'' . $hostname . '\'[/em]');
         $_REQUEST['adduser'] = true;
         $_add_user_error = true;
     } else {
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index c51f19ee5c..18d1ead1ed 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -285,8 +285,8 @@ class PMA_Message_test extends PHPUnit_Framework_TestCase
     {
         return array(
             array(
-                '[i]test[/i][i]aa[i/][em]test[/em]',
-                '<em>test</em><em>aa[i/]<em>test</em>'
+                '[em]test[/em][em]aa[em/][em]test[/em]',
+                '<em>test</em><em>aa[em/]<em>test</em>'
             ),
             array(
                 '[b]test[/b][strong]test[/strong]',