Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-05-15 12:15:31 +02:00
commit 30d4cd3302

View File

@ -588,12 +588,12 @@ class PMA_Header
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $basedir . 'print.css" />';
} else {
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $theme_path . '/jquery/jquery-ui-1.9.2.custom.css" />';
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $basedir . 'phpmyadmin.css.php'
. $common_url . '&amp;nocache='
. $theme_id . $GLOBALS['text_dir'] . '" />';
$retval .= '<link rel="stylesheet" type="text/css" href="'
. $theme_path . '/jquery/jquery-ui-1.9.2.custom.css" />';
}
return $retval;