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-05-18 18:13:41 +02:00
commit ad81be128a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/SavedSearches.class.php
View File

@ -130,8 +130,8 @@ class PMA_SavedSearches
/**
* Setter for criterias
*
* @param array $criterias Criterias of saved searches
* @param bool $json Criterias are in JSON format
* @param array|string $criterias Criterias of saved searches
* @param bool $json Criterias are in JSON format
*
* @return static
*/

1
libraries/Scripts.class.php
View File

@ -51,6 +51,7 @@ class PMA_Scripts
private function _includeFiles($files)
{
$dynamic_scripts = "";
$scripts = array();
foreach ($files as $value) {
if (strpos($value['filename'], "?") !== false) {
$dynamic_scripts .= "<script type='text/javascript' src='js/"