summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpfspot.class.php9
-rw-r--r--phpfspot_img.php2
2 files changed, 5 insertions, 6 deletions
diff --git a/phpfspot.class.php b/phpfspot.class.php
index 12e14fa..b8f45a8 100644
--- a/phpfspot.class.php
+++ b/phpfspot.class.php
@@ -488,10 +488,9 @@ class PHPFSPOT {
* is usally not the same as on the webserver, this function
* will replace the path with that one specified in the cfg
* @param string $path
- * @param integer $width
* @return string
*/
- public function translate_path($path, $width = 0)
+ public function translate_path($path)
{
return str_replace($this->cfg->path_replace_from, $this->cfg->path_replace_to, $path);
@@ -541,7 +540,7 @@ class PHPFSPOT {
return;
}
- $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
+ $orig_path = $this->translate_path($this->parse_uri($details['uri']));
$thumb_path = $this->get_thumb_path($this->cfg->photo_width, $photo);
if(!file_exists($orig_path)) {
@@ -1555,7 +1554,7 @@ class PHPFSPOT {
$details = $this->get_photo_details($idx);
/* calculate file MD5 sum */
- $full_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
+ $full_path = $this->translate_path($this->parse_uri($details['uri']));
if(!file_exists($full_path)) {
$this->_error("File ". $full_path ." does not exist\n");
@@ -2200,7 +2199,7 @@ class PHPFSPOT {
<br>
". $details['description']);
- $orig_path = $this->translate_path($this->parse_uri($details['uri'], 'fullpath'));
+ $orig_path = $this->translate_path($this->parse_uri($details['uri']));
/* get EXIF information if JPEG */
if($details['mime'] == "image/jpeg") {
diff --git a/phpfspot_img.php b/phpfspot_img.php
index f298b00..461f5c6 100644
--- a/phpfspot_img.php
+++ b/phpfspot_img.php
@@ -79,7 +79,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'));
+ $fullpath = $this->parent->translate_path($this->parent->parse_uri($details['uri']));
}
/* show thumbnail */
else {