[Customisation Database Commits] r1111 - /trunk/titania/includes/core/url.php

[Nathan Guse]

Author: EXreaction
Date: Thu Apr 22 17:21:06 2010
New Revision: 1111

Log:
Should fix #60625

Modified:
    trunk/titania/includes/core/url.php

Modified: trunk/titania/includes/core/url.php
==============================================================================
*** trunk/titania/includes/core/url.php (original)
--- trunk/titania/includes/core/url.php Thu Apr 22 17:21:06 2010
***************
*** 73,105 ****
  			}
  		}
  
- 		global $_SID;
- 
  		// Prevent rebuilding...
  		if (self::is_built($base))
  		{
  			return self::append_url($base, $params);
  		}
  
! 		if (!is_array($params))
! 		{
! 			$params = self::split_params($params);
! 		}
  
  		$final_url = self::$root_url . $base;
  
- 		// Append a / at the end if required
- 		if (substr($final_url, -1) != '/')
- 		{
- 			$final_url .= '/';
- 		}
- 
  		// Add the Session ID if required.
  		if ($_SID)
  		{
  			$params['sid'] = $_SID;
  		}
  
  		return self::append_url($final_url, $params);
  	}
  
--- 73,105 ----
  			}
  		}
  
  		// Prevent rebuilding...
  		if (self::is_built($base))
  		{
  			return self::append_url($base, $params);
  		}
  
! 		// URL Encode the base
! 		$base = explode('/', $base);
! 		$base = array_map('urlencode', $base);
! 		$base = implode('/', $base) . '/';
  
+ 		// Start building the final URL
  		$final_url = self::$root_url . $base;
  
  		// Add the Session ID if required.
+ 		global $_SID;
  		if ($_SID)
  		{
+ 			if (!is_array($params))
+ 			{
+ 				$params = self::split_params($params);
+ 			}
+ 
  			$params['sid'] = $_SID;
  		}
  
+ 		// Use the append_url function to add the parameters and return
  		return self::append_url($final_url, $params);
  	}