Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-07-31 17:50:56 +02:00
commit 67e54fdd97

View File

@ -15,9 +15,9 @@ $bg = $_SESSION['PMA_Theme']->getImgPath() . 'sprites.png';
/* Check if there is a valid data file for sprites */
if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
?>
/* Icon sprites */
.icon {
?>
/* Icon sprites */
.icon {
margin: 0;
margin-<?php echo $left; ?>: .3em;
padding: 0 !important;
@ -26,8 +26,8 @@ if (is_readable($_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php')) {
background-image: url('<?php echo $bg; ?>') !important;
background-repeat: no-repeat !important;
background-position: top left !important;
}
<?php
}
<?php
include_once $_SESSION['PMA_Theme']->getPath() . '/sprites.lib.php';
$sprites = array();