Changeset 2026

Timestamp:

May 26, 2007, 12:02:47 AM (17 years ago)

Author:

rub

Message:

Improvement of picture url built

Location:

trunk/include

Files:

• functions.inc.php (modified) (1 diff)
• functions_picture.inc.php (modified) (4 diffs)
• functions_url.inc.php (modified) (1 diff)

trunk/include/functions.inc.php

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

trunk/include/functions_picture.inc.php

@@ -4 +4 @@
 // | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
@@ -48 +47 @@
   if ( !url_is_remote($url) )
   {
-    $url = get_root_url().$url;
+    $url = embellish_url(get_root_url().$url);
   }
   // plugins want another url ?
@@ -122 +121 @@
   if ( !url_is_remote($url) )
   {
-    $url = get_root_url().$url;
+    $url = embellish_url(get_root_url().$url);
   }
   return $url;
@@ -180 +179 @@
   if (!empty($url) and !url_is_remote($url) )
   {
-    $url = get_root_url().$url;
+    $url = embellish_url(get_root_url().$url);
   }
   // plugins want another url ?

trunk/include/functions_url.inc.php

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