gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-09-23 14:10:05 +02:00
commit e225e3502e
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/Font.class.php
View File

@ -19,12 +19,10 @@ class PMA_Font
/**
* Get list with characters and the corresponding width modifiers.
*
* @param string $font name of the font like Arial,sans-serif etc
*
* @return array with characters and corresponding width modifier
* @access public
*/
public static function getCharLists($font)
public static function getCharLists()
{
// list of characters and their width modifiers
$charLists = array();
@ -96,7 +94,7 @@ class PMA_Font
|| !isset($charLists[0]["chars"]) || !is_array($charLists[0]["chars"])
|| !isset($charLists[0]["modifier"])
) {
$charLists = self::getCharLists($font);
$charLists = self::getCharLists();
}
/*

1
libraries/Message.class.php
View File

@ -746,7 +746,6 @@ class PMA_Message
*/
public function getMessageWithIcon($message)
{
$image = '';
if ('error' == $this->getLevel()) {
$image = 's_error.png';
} elseif ('success' == $this->getLevel()) {