Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server
2011-04-25 14:40:09 +02:00
2 changed files with 3 additions and 1 deletions

View File

@@ -569,7 +569,9 @@ echo __('Remove database');
if (!empty($cfg['Servers'][$server]['pmadb'])) {
$message->isError(true);
}
echo '<div class="operations_full_width">';
$message->display();
echo '</div>';
} // end if
} // end if (!$is_information_schema)

View File

@@ -179,7 +179,7 @@ function PMA_RangeOfUsers($initial = '')
* @param array $row the row
* @param boolean $enableHTML add <dfn> tag with tooltips
*
* @global ressource $user_link the database connection
* @global resource $user_link the database connection
*
* @return array
*/