From: Andreas Unterkircher Date: Sat, 12 Apr 2008 17:30:12 +0000 (+0200) Subject: parse_uri() needs two parameters X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=phpfspot.git;a=commitdiff_plain;h=cd7402eecd6b5e50dcc62d8394342e6717c359e5;ds=sidebyside parse_uri() needs two parameters Signed-off-by: Andreas Unterkircher --- diff --git a/phpfspot.class.php b/phpfspot.class.php index 95227aa..b5dd177 100644 --- a/phpfspot.class.php +++ b/phpfspot.class.php @@ -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 {
". $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") { diff --git a/phpfspot_img.php b/phpfspot_img.php index 412c5f2..f3eb308 100644 --- a/phpfspot_img.php +++ b/phpfspot_img.php @@ -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 {