From d981f67a8cac1abd7ae59a56b559a1262b26e3e4 Mon Sep 17 00:00:00 2001 From: secretr Date: Tue, 22 May 2012 10:54:54 +0000 Subject: [PATCH] nexprev amp; fix --- e107_core/shortcodes/single/nextprev.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/e107_core/shortcodes/single/nextprev.php b/e107_core/shortcodes/single/nextprev.php index 1fdd8e705..2161170a7 100644 --- a/e107_core/shortcodes/single/nextprev.php +++ b/e107_core/shortcodes/single/nextprev.php @@ -142,16 +142,16 @@ function nextprev_shortcode($parm = '') // Format is: route::module/controller/action::urlParams::urlOptions // Example: url::news/list/category::id=xxx&name=yyy&page=--PAGE--::full=1 // WARNING - url parameter string have to be rawurlencode-ed BEFORE passed to the shortcode, or it'll break everything - $urlParms = explode('::', $parm['url']); - $url = str_replace(array('--FROM--', '--AMP--'), array('[FROM]', '&'), $e107->url->create($urlParms[1], $urlParms[2], varset($urlParms[3]))); + $urlParms = explode('::', str_replace('--AMP--', '&', $parm['url'])); + $url = str_replace('--FROM--', '[FROM]', $e107->url->create($urlParms[1], $urlParms[2], varset($urlParms[3]))); } elseif(substr($parm['url'], 0, 5) == 'url::') { // New - use URL assembling engine // Format is: url::module/controller/action?id=xxx&name=yyy&page=--PAGE--::full=1 // WARNING - url parameter string have to be rawurlencode-ed BEFORE passed to the shortcode, or it'll break everything - $urlParms = explode('::', $parm['url']); - $url = str_replace(array('--FROM--', '--AMP--'), array('[FROM]', '&'), $e107->url->create($urlParms[1], array(), varset($urlParms[2]))); + $urlParms = explode('::', str_replace('--AMP--', '&', $parm['url'])); + $url = str_replace('--FROM--', '[FROM]', $e107->url->create($urlParms[1], array(), varset($urlParms[2]))); } // just regular full or absolute URL else $url = str_replace(array('--FROM--', '--AMP--'), array('[FROM]', '&'), $parm['url']);