]> git.immae.eu Git - github/shaarli/Shaarli.git/commitdiff
Merge pull request #424 from ArthurHoaro/search
authorArthur <arthur@hoa.ro>
Wed, 6 Jan 2016 18:57:42 +0000 (19:57 +0100)
committerArthur <arthur@hoa.ro>
Wed, 6 Jan 2016 18:57:42 +0000 (19:57 +0100)
Link filter refactoring

1  2 
index.php

diff --cc index.php
index 1a83ca40c3c3126242058e2f5d0d96740fde3387,2815f02e5e40e93f946051a2580da138f0744ca4..cd83600bf7c4ab5c87d4606deced9a4c481cea1b
+++ b/index.php
@@@ -1460,15 -1478,14 +1477,16 @@@ function renderPage(
              $PAGE->renderPage('changetag');
              exit;
          }
 -        if (!tokenOk($_POST['token'])) die('Wrong token.');
 +
 +        if (!tokenOk($_POST['token'])) {
 +            die('Wrong token.');
 +        }
  
          // Delete a tag:
 -        if (!empty($_POST['deletetag']) && !empty($_POST['fromtag']))
 -        {
 +        if (isset($_POST['deletetag']) && !empty($_POST['fromtag'])) {
              $needle=trim($_POST['fromtag']);
-             $linksToAlter = $LINKSDB->filterTags($needle,true); // True for case-sensitive tag search.
+             // True for case-sensitive tag search.
+             $linksToAlter = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $needle, true);
              foreach($linksToAlter as $key=>$value)
              {
                  $tags = explode(' ',trim($value['tags']));
          }
  
          // Rename a tag:
 -        if (!empty($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag']))
 -        {
 +        if (isset($_POST['renametag']) && !empty($_POST['fromtag']) && !empty($_POST['totag'])) {
              $needle=trim($_POST['fromtag']);
-             $linksToAlter = $LINKSDB->filterTags($needle,true); // true for case-sensitive tag search.
+             // True for case-sensitive tag search.
+             $linksToAlter = $LINKSDB->filter(LinkFilter::$FILTER_TAG, $needle, true);
              foreach($linksToAlter as $key=>$value)
              {
                  $tags = explode(' ',trim($value['tags']));