From 63037816a75d72b5dcff860aaade583f0218ad9d 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:36:02 +0200
Subject: [PATCH 1/4] Wrap long lines

---
 libraries/sanitizing.lib.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index d64ace626c..0242e445e8 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -115,7 +115,8 @@ function PMA_sanitize($message, $escape = false, $safe = false)
         '[/a]'      => '</a>',
         '[sup]'     => '<sup>',
         '[/sup]'    => '</sup>',
-        '[conferr]' => '<iframe src="show_config_errors.php" />' // used in common.inc.php
+         // used in common.inc.php:
+        '[conferr]' => '<iframe src="show_config_errors.php" />',
     );
     /* Adjust links for setup, which lives in subfolder */
     if (defined('PMA_SETUP')) {

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 2/4] 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]',

From 58054705ef3828f2292aa2b243dc2adb6fd4698c 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:38:08 +0200
Subject: [PATCH 3/4] Drop deprecated [b] from bbcode support

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

diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index a71292cf86..864f5b21cb 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -99,8 +99,6 @@ function PMA_sanitize($message, $escape = false, $safe = false)
     $replace_pairs = array(
         '[em]'      => '<em>',
         '[/em]'     => '</em>',
-        '[b]'       => '<strong>',  // deprecated by strong
-        '[/b]'      => '</strong>', // deprecated by strong
         '[strong]'  => '<strong>',
         '[/strong]' => '</strong>',
         '[tt]'      => '<code>',    // deprecated by CODE or KBD
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index 18d1ead1ed..30749151ec 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -289,7 +289,7 @@ class PMA_Message_test extends PHPUnit_Framework_TestCase
                 '<em>test</em><em>aa[em/]<em>test</em>'
             ),
             array(
-                '[b]test[/b][strong]test[/strong]',
+                '[strong]test[/strong][strong]test[/strong]',
                 '<strong>test</strong><strong>test</strong>'
             ),
             array(
diff --git a/test/libraries/PMA_sanitize_test.php b/test/libraries/PMA_sanitize_test.php
index f4546f701e..5712ba85bf 100644
--- a/test/libraries/PMA_sanitize_test.php
+++ b/test/libraries/PMA_sanitize_test.php
@@ -107,7 +107,7 @@ class PMA_sanitize_test extends PHPUnit_Framework_TestCase
     {
         $this->assertEquals(
             '<strong>strong</strong>',
-            PMA_sanitize('[b]strong[/b]')
+            PMA_sanitize('[strong]strong[/strong]')
         );
     }
 

From c83fa4b17941e3a50168877e8846a5c6acafef42 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:38:31 +0200
Subject: [PATCH 4/4] Drop deprecated [tt] from bbcode support

---
 libraries/sanitizing.lib.php      | 2 --
 test/classes/PMA_Message_test.php | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 864f5b21cb..83f5c818ae 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -101,8 +101,6 @@ function PMA_sanitize($message, $escape = false, $safe = false)
         '[/em]'     => '</em>',
         '[strong]'  => '<strong>',
         '[/strong]' => '</strong>',
-        '[tt]'      => '<code>',    // deprecated by CODE or KBD
-        '[/tt]'     => '</code>',   // deprecated by CODE or KBD
         '[code]'    => '<code>',
         '[/code]'   => '</code>',
         '[kbd]'     => '<kbd>',
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index 30749151ec..0537d14eb3 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -293,7 +293,7 @@ class PMA_Message_test extends PHPUnit_Framework_TestCase
                 '<strong>test</strong><strong>test</strong>'
             ),
             array(
-                '[tt]test[/tt][code]test[/code]',
+                '[code]test[/code][code]test[/code]',
                 '<code>test</code><code>test</code>'
             ),
             array(