[pLog-svn] r2389 - plog/branches/plog-1.0.2/class/net

[jondaley at devel.plogworld.net]

Author: jondaley
Date: 2005-08-02 12:20:46 +0000 (Tue, 02 Aug 2005)
New Revision: 2389

Modified:
   plog/branches/plog-1.0.2/class/net/customurlhandler.class.php
Log:
fixed fallback urls, we need to include the path in order to match these correctly.  also fixed one brace typo

Modified: plog/branches/plog-1.0.2/class/net/customurlhandler.class.php
===================================================================
--- plog/branches/plog-1.0.2/class/net/customurlhandler.class.php	2005-08-02 12:19:50 UTC (rev 2388)
+++ plog/branches/plog-1.0.2/class/net/customurlhandler.class.php	2005-08-02 12:20:46 UTC (rev 2389)
@@ -58,19 +58,18 @@
 									 "resource_download_link_format" => $path.$config->getValue( "resource_download_link_format" ),
 									 "resource_preview_link_format" => $path.$config->getValue( "resource_preview_link_format" ),
 									 "resource_medium_size_preview_link_format" => $path.$config->getValue( "resource_medium_size_preview_link_format" ));
-			
 			// if the url did not match any of the current settings, then let's try to parse it as an old
 			// "search engine friendly" url
-			$this->_fallback = Array( "permalink_format" => "/post/{blogid}/{postid}",
-									 "category_link_format" => "/category/{blogid}/{postid}",
-									 "blog_link_format" => "/blogid}",
-									 "archive_link_format" => "/archives/{blogid}/{year}/{month}/{day}",
-									 "user_posts_link_format" => "/user/{blogid}/{userid}",
-									 "post_trackbacks_link_format" => "/trackbacks/{blogid}/{postid}",
-									 "template_link_format" => "/static/{blogid}/{templatename}",
-									 "album_link_format" => "/album/{blogid}/{albumid}",
-									 "resource_link_format" => "/resource/{blogid}/{resourceid}",
-									 "resource_download_link_format" => "/get/{blogid}/{resourceid}",
+			$this->_fallback = Array( "permalink_format" => $path."/post/{blogid}/{postid}",
+									 "category_link_format" => $path."/category/{blogid}/{catid}",
+									 "blog_link_format" => $path."/{blogid}",
+									 "archive_link_format" => $path."/archives/{blogid}/{year}/{month}/{day}",
+									 "user_posts_link_format" => $path."/user/{blogid}/{userid}",
+									 "post_trackbacks_link_format" => $path."/trackbacks/{blogid}/{postid}",
+									 "template_link_format" => $path."/static/{blogid}/{templatename}",
+									 "album_link_format" => $path."/album/{blogid}/{albumid}",
+									 "resource_link_format" => $path."/resource/{blogid}/{resourceid}",
+									 "resource_download_link_format" => $path."/get/{blogid}/{resourceid}",
 									 "resource_preview_link_format" => "",  // this one does not exist
 									 "resource_medium_size_preview_link_format" => "" ); // this one does not exist either
 		}
@@ -79,7 +78,6 @@
 		{
 			// decode the string, since it seems that php will not do it for us in this case...
 			$requestUri = urldecode( $requestUri);
-			
 	        // we should remove anything that comes after a '?' parameter, since we don't want to take
 	        // HTTP GET parameters into account                        
             if(( $pos = strpos( $requestUri, '?' ))) {