adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-07-21 09:03:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.8'

Browse Source
This commit is contained in:
plegall
2016-11-17 14:14:16 +01:00
parent a215b0371a 9a93d1f44b
commit dde2426bbf
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+10
View File
@@ -2073,6 +2073,16 @@ function mobile_theme()
*/
function url_check_format($url)
{
if (strpos($url, '"') !== false)
{
return false;
}
if (strncmp($url, 'http://', 7) !== 0 and strncmp($url, 'https://', 8) !== 0)
{
return false;
}
return filter_var($url, FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED | FILTER_FLAG_HOST_REQUIRED)!==false;
}
include/functions_search.inc.php
+3 -3
View File
@@ -1284,13 +1284,13 @@ function get_quick_search_results_no_cache($q, $options)
$ids = qsearch_eval($expression, $qsr, $tmp, $search_results['qs']['unmatched_terms']);
$debug[] = "<!--\nparsed: ".$expression;
$debug[] = "<!--\nparsed: ".htmlspecialchars($expression);
$debug[] = count($expression->stokens).' tokens';
for ($i=0; $i<count($expression->stokens); $i++)
{
$debug[] = $expression->stokens[$i].': '.count($qsr->tag_ids[$i]).' tags, '.count($qsr->tag_iids[$i]).' tiids, '.count($qsr->images_iids[$i]).' iiids, '.count($qsr->iids[$i]).' iids'
$debug[] = htmlspecialchars($expression->stokens[$i]).': '.count($qsr->tag_ids[$i]).' tags, '.count($qsr->tag_iids[$i]).' tiids, '.count($qsr->images_iids[$i]).' iiids, '.count($qsr->iids[$i]).' iids'
.' modifier:'.dechex($expression->stoken_modifiers[$i])
.( !empty($expression->stokens[$i]->variants) ? ' variants: '.implode(', ',$expression->stokens[$i]->variants): '');
.( !empty($expression->stokens[$i]->variants) ? ' variants: '.htmlspecialchars(implode(', ',$expression->stokens[$i]->variants)): '');
}
$debug[] = 'before perms '.count($ids);