parse_uri() needs two parameters
authorAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 17:30:12 +0000 (19:30 +0200)
committerAndreas Unterkircher <unki@netshadow.at>
Sat, 12 Apr 2008 17:30:12 +0000 (19:30 +0200)
Signed-off-by: Andreas Unterkircher <unki@netshadow.at>
phpfspot.class.php
phpfspot_img.php

index 95227aa8195250d15d616bf7e46a721e20fc8630..b5dd177307e07012704e93486f6a7ab6d4143605 100644 (file)
@@ -543,7 +543,7 @@ class PHPFSPOT {
          return;
       }
 
-      $orig_path = $this->translate_path($this->parse_uri($details['uri']));
+      $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
       $thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
 
       if(!file_exists($orig_path)) {
@@ -1557,7 +1557,7 @@ class PHPFSPOT {
       $details = $this->get_photo_details($idx);
 
       /* calculate file MD5 sum */
-      $full_path = $this->translate_path($this->parse_uri($details['uri']));
+      $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
 
       if(!file_exists($full_path)) {
          $this->_error("File ". $full_path ." does not exist\n");
@@ -2202,7 +2202,7 @@ class PHPFSPOT {
 <br>
 ". $details['description']);
 
-         $orig_path = $this->translate_path($this->parse_uri($details['uri']));
+         $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
 
          /* get EXIF information if JPEG */
          if($details['mime'] == "image/jpeg") {
index 412c5f26dc0ed07fd0a03f10d5b4add87145de5e..f3eb3088f4b363030ccb11b88b7c4a080768dd58 100644 (file)
@@ -78,7 +78,7 @@ class PHPFSPOT_IMG {
 
       /* no width specified - show photo in its original size */
       if($width == 0) {
-         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri']));
+         $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri'], 'fullpath'));
       }
       /* show thumbnail */
       else {