aboutsummaryrefslogtreecommitdiffhomepage
path: root/application/LinkDB.php
diff options
context:
space:
mode:
authorVirtualTam <virtualtam+github@flibidi.net>2017-08-03 16:27:59 +0200
committerGitHub <noreply@github.com>2017-08-03 16:27:59 +0200
commitf09e1e318e0b1c72aa659c20b715be508009175f (patch)
tree68d84f2583d5aa799128e3ec418e20eda4ba2c5f /application/LinkDB.php
parentf5568f87b1a23b36f8d3623aacfbb810d1d60dc0 (diff)
parentf210d94f716acd86fd22c9651f591a778490e8a9 (diff)
downloadShaarli-f09e1e318e0b1c72aa659c20b715be508009175f.tar.gz
Shaarli-f09e1e318e0b1c72aa659c20b715be508009175f.tar.zst
Shaarli-f09e1e318e0b1c72aa659c20b715be508009175f.zip
Merge pull request #889 from Lucas-C/master
Using only one form in linklist.html - fix #885
Diffstat (limited to 'application/LinkDB.php')
-rw-r--r--application/LinkDB.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/application/LinkDB.php b/application/LinkDB.php
index 8ca0fab3..9e3efd6b 100644
--- a/application/LinkDB.php
+++ b/application/LinkDB.php
@@ -417,21 +417,22 @@ You use the community supported version of the original Shaarli project, by Seba
417 * - searchterm: term search 417 * - searchterm: term search
418 * @param bool $casesensitive Optional: Perform case sensitive filter 418 * @param bool $casesensitive Optional: Perform case sensitive filter
419 * @param string $visibility return only all/private/public links 419 * @param string $visibility return only all/private/public links
420 * @param string $untaggedonly return only untagged links
420 * 421 *
421 * @return array filtered links, all links if no suitable filter was provided. 422 * @return array filtered links, all links if no suitable filter was provided.
422 */ 423 */
423 public function filterSearch($filterRequest = array(), $casesensitive = false, $visibility = 'all') 424 public function filterSearch($filterRequest = array(), $casesensitive = false, $visibility = 'all', $untaggedonly = false)
424 { 425 {
425 // Filter link database according to parameters. 426 // Filter link database according to parameters.
426 $searchtags = isset($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : ''; 427 $searchtags = isset($filterRequest['searchtags']) ? escape($filterRequest['searchtags']) : '';
427 $searchterm = isset($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : ''; 428 $searchterm = isset($filterRequest['searchterm']) ? escape($filterRequest['searchterm']) : '';
428 429
429 // Search tags + fullsearch - blank string parameter will return all links. 430 // Search tags + fullsearch - blank string parameter will return all links.
430 $type = LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT; 431 $type = LinkFilter::$FILTER_TAG | LinkFilter::$FILTER_TEXT; // == "vuotext"
431 $request = [$searchtags, $searchterm]; 432 $request = [$searchtags, $searchterm];
432 433
433 $linkFilter = new LinkFilter($this); 434 $linkFilter = new LinkFilter($this);
434 return $linkFilter->filter($type, $request, $casesensitive, $visibility); 435 return $linkFilter->filter($type, $request, $casesensitive, $visibility, $untaggedonly);
435 } 436 }
436 437
437 /** 438 /**