mirrors/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2025-05-04 07:09:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvement of picture url built

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@2026 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2007-05-25 22:02:47 +00:00
parent bcb81f3efd
commit 70ad3c68fc
3 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/functions.inc.php
View file

@ -792,8 +792,9 @@ function get_thumbnail_url($element_info)
$path = get_thumbnail_location($element_info); $path = get_thumbnail_location($element_info);
if ( !url_is_remote($path) ) if ( !url_is_remote($path) )
{ {
$path = get_root_url().$path; $path = embellish_url(get_root_url().$path);
} }
// plugins want another url ? // plugins want another url ?
$path = trigger_event('get_thumbnail_url', $path, $element_info); $path = trigger_event('get_thumbnail_url', $path, $element_info);
return $path; return $path;

9
include/functions_picture.inc.php
View file

@ -3,8 +3,7 @@
// | PhpWebGallery - a PHP based picture gallery | // | PhpWebGallery - a PHP based picture gallery |
// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
// +-----------------------------------------------------------------------+ // +-----------------------------------------------------------------------+
// | branch : BSF (Best So Far) // | file : $Id$
// | file : $RCSfile$
// | last update : $Date$ // | last update : $Date$
// | last modifier : $Author$ // | last modifier : $Author$
// | revision : $Revision$ // | revision : $Revision$
@ -47,7 +46,7 @@ function get_element_url($element_info)
$url = get_element_location($element_info); $url = get_element_location($element_info);
if ( !url_is_remote($url) ) if ( !url_is_remote($url) )
{ {
$url = get_root_url().$url; $url = embellish_url(get_root_url().$url);
} }
// plugins want another url ? // plugins want another url ?
return trigger_event('get_element_url', $url, $element_info); return trigger_event('get_element_url', $url, $element_info);
@ -121,7 +120,7 @@ function get_image_url($element_info)
$url = get_image_location($element_info); $url = get_image_location($element_info);
if ( !url_is_remote($url) ) if ( !url_is_remote($url) )
{ {
$url = get_root_url().$url; $url = embellish_url(get_root_url().$url);
} }
return $url; return $url;
} }
@ -179,7 +178,7 @@ function get_high_url($element_info)
$url = get_high_location($element_info); $url = get_high_location($element_info);
if (!empty($url) and !url_is_remote($url) ) if (!empty($url) and !url_is_remote($url) )
{ {
$url = get_root_url().$url; $url = embellish_url(get_root_url().$url);
} }
// plugins want another url ? // plugins want another url ?
return trigger_event('get_high_url', $url, $element_info); return trigger_event('get_high_url', $url, $element_info);

11
include/functions_url.inc.php
View file

@ -701,4 +701,15 @@ function unset_make_full_url()
} }
} }
/**
* Embellish the url argument
*
* @param $url
* @return $url embellished
*/
function embellish_url($url)
{
return str_replace('/./', '/', $url);
}
?> ?>