1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-30 01:30:32 +02:00

- Forums working again (general functionallity) - the new URL assembling/configuration implemented. SEF URL config will be added when forums are 100% functional.

- Minor URL assembling issues fixed
This commit is contained in:
secretr
2011-11-28 14:19:19 +00:00
parent ed9f06c50f
commit 497efdb710
15 changed files with 460 additions and 89 deletions

View File

@@ -1723,7 +1723,7 @@ class eRouter
$format = isset($config['format']) && $config['format'] ? $config['format'] : self::FORMAT_GET;
// Fix base url for legacy links
if($config['noSingleEntry']) $base = $options['full'] ? SITEURLBASE : SITEURL;
if($config['noSingleEntry']) $base = $options['full'] ? SITEURL : e_HTTP;
// TODO - main module - don't include it in the return URL
@@ -1850,8 +1850,8 @@ class eRouter
{
$pairs = array();
$equal = $options['equal'];
$ampersand = $options['amp'];
$encode = $options['encode'];
$ampersand = !$encode && $options['amp'] == '&' ? '&' : $options['amp'];
foreach ($params as $k => $v)
{
if (null !== $key) $k = $key.'['.$k.']';