issue120, parse_user_friendly_url() did an unwanted session cleanup

Signed-off-by: Andreas Unterkircher <unki@netshadow.at>

diff --git a/phpfspot.class.php b/phpfspot.class.php
index 9c4321aacc8132f9e49eca0526e3cbf5573e809b..54308aa25ca3e109e2e4d7c7ada4e958b72a1b44 100644 (file)
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -3112,14 +3112,14 @@ class PHPFSPOT {
    {
       if(preg_match('/\/photoview\/|\/photo\/|\/tag\//', $request_uri)) {
 
    {
       if(preg_match('/\/photoview\/|\/photo\/|\/tag\//', $request_uri)) {
 

-         unset($_SESSION['start_action']);
-         unset($_SESSION['selected_tags']);
-

          $options = explode('/', $request_uri);
 
          switch($options[1]) {
             case 'photoview':
                if(is_numeric($options[2])) {
          $options = explode('/', $request_uri);
 
          switch($options[1]) {
             case 'photoview':
                if(is_numeric($options[2])) {

+                  $this->session_cleanup();
+                  //unset($_SESSION['start_action']);
+                  //unset($_SESSION['selected_tags']);

                   $_GET['mode'] = 'showp';
                   return $this->showPhoto($options[2]);
                }
                   $_GET['mode'] = 'showp';
                   return $this->showPhoto($options[2]);
                }


@@ -3179,6 +3179,7 @@ class PHPFSPOT {
       $this->resetTagSearch();
       $this->resetNameSearch();
       $this->resetDateSearch();
       $this->resetTagSearch();
       $this->resetNameSearch();
       $this->resetDateSearch();

+      $this->resetTags();

 
    } // session_cleanup()
 
 
    } // session_cleanup()