Knah-Tsaeb/MyShaarli
Knah-Tsaeb/MyShaarli
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[fix] warning in search form when empty via field

Browse source
This commit is contained in:
Knah Tsaeb 2014-01-03 09:39:02 +01:00
parent 4123658eae
commit f1a8ca9cc8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
index.php
View file

@ -798,7 +798,7 @@ public function filterFulltext($searchterms)
|| (strpos(strtolower($l['description']),$s)!==false) || (strpos(strtolower($l['description']),$s)!==false)
|| (strpos(strtolower($l['url']),$s)!==false) || (strpos(strtolower($l['url']),$s)!==false)
|| (strpos(strtolower($l['tags']),$s)!==false) || (strpos(strtolower($l['tags']),$s)!==false)
|| (strpos(strtolower($l['via']),$s)!==false); || (!empty($l['via']) && (strpos(strtolower($l['via']),$s)!==false));
if ($found) $filtered[$l['linkdate']] = $l; if ($found) $filtered[$l['linkdate']] = $l;
} }
krsort($filtered); krsort($filtered);
@ -904,7 +904,7 @@ function showRSS()
else $linksToDisplay = $LINKSDB; else $linksToDisplay = $LINKSDB;
$nblinksToDisplay = 50; // Number of links to display. $nblinksToDisplay = 50; // Number of links to display.
if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
{ {
$nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ; $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
} }
@ -984,7 +984,7 @@ function showATOM()
else $linksToDisplay = $LINKSDB; else $linksToDisplay = $LINKSDB;
$nblinksToDisplay = 50; // Number of links to display. $nblinksToDisplay = 50; // Number of links to display.
if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links. if (!empty($_GET['nb'])) // In URL, you can specificy the number of links. Example: nb=200 or nb=all for all links.
{ {
$nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ; $nblinksToDisplay = $_GET['nb']=='all' ? count($linksToDisplay) : max($_GET['nb']+0,1) ;
} }
@ -1576,7 +1576,7 @@ function renderPage()
{ {
// Look for charset in html header. // Look for charset in html header.
preg_match('#<meta .*charset=.*>#Usi', $data, $meta); preg_match('#<meta .*charset=.*>#Usi', $data, $meta);
// If found, extract encoding. // If found, extract encoding.
if (!empty($meta[0])) if (!empty($meta[0]))
{ {
@ -1586,7 +1586,7 @@ function renderPage()
$html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8'; $html_charset = (!empty($enc[1])) ? strtolower($enc[1]) : 'utf-8';
} }
else { $html_charset = 'utf-8'; } else { $html_charset = 'utf-8'; }
// Extract title // Extract title
$title = html_extract_title($data); $title = html_extract_title($data);
if (!empty($title)) if (!empty($title))