Merge branch 'FreshRSS/dev' into dev

This commit is contained in:
Alexandre Alapetite
2015-07-14 00:12:58 +02:00
2 changed files with 4 additions and 2 deletions

View File

@@ -168,7 +168,7 @@ class Minz_Extension {
$url = '/ext.php?f=' . $file_name_url .
'&t=' . $type .
'&' . $mtime;
return Minz_Url::display($url);
return Minz_Url::display($url, 'php');
}
/**

View File

@@ -31,8 +31,10 @@ class Minz_Url {
if ($isArray) {
$url_string .= self::printUri($url, $encodage);
} else {
} elseif ($encodage === 'html') {
$url_string = Minz_Helper::htmlspecialchars_utf8($url_string . $url);
} else {
$url_string .= $url;
}
return $url_string;