default theme, menu and logo cell merged

[phpfspot.git] / phpfspot.class.php

diff --git a/phpfspot.class.php b/phpfspot.class.php
index b3ad278458a350089ae2ea5ac6e09107e1d9be0b..80f02edd414c124ea5f55e22b0713781701b5c02 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -615,6 +615,9 @@ class PHPFSPOT {
       if(!isset($_SESSION['selected_tags']))
          $_SESSION['selected_tags'] = Array();
 
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
       if(!in_array($tag, $_SESSION['selected_tags']))
          array_push($_SESSION['selected_tags'], $tag);
    
@@ -628,6 +631,9 @@ class PHPFSPOT {
     */
    public function delTag($tag)
    {
+      if(isset($_SESSION['searchfor']))
+         unset($_SESSION['searchfor']);
+
       if(isset($_SESSION['selected_tags'])) {
          $key = array_search($tag, $_SESSION['selected_tags']);
          unset($_SESSION['selected_tags'][$key]);
@@ -1955,7 +1961,7 @@ class PHPFSPOT {
                return " ORDER BY p.name ASC";
             }
             else {
-               return " ORDER BY p.uri ASC";
+               return " ORDER BY basename(p.uri) ASC";
             }
             break;
          case 'name_desc':
@@ -1963,7 +1969,7 @@ class PHPFSPOT {
                return " ORDER BY p.name DESC";
             }
             else {
-               return " ORDER BY p.uri DESC";
+               return " ORDER BY basename(p.uri) DESC";
             }
             break;
       }