Drop deprecated [i] from bbcode support

catchsomnath · Sep 5, 2012 · a567a78 · a567a78
1 parent 6303781
commit a567a78
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -213,7 +213,7 @@
         . " 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
@@ -285,8 +285,8 @@ public function decodeBBDataProvider()
     {
         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]',