mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-07-31 20:00:37 +02:00
Code Issues Releases Wiki Activity

Fix errors in path decoding for sitelinks (e_PLUGIN substituted as e_IMAGE)

Browse Source
This commit is contained in:
SteveD
2012-12-16 19:23:11 +00:00
parent 3fb760da3f
commit bf8d7bdbc1
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_handlers/e_parse_class.php
View File

@@ -1891,7 +1891,7 @@ class e_parse
* TODO - runtime cache of search/replace arrays (object property) when $mode !== '' * TODO - runtime cache of search/replace arrays (object property) when $mode !== ''
* @param string $text * @param string $text
* @param string $mode [optional] abs|full "full" = produce absolute URL path, e.g. http://sitename.com/e107_plugins/etc * @param string $mode [optional] abs|full "full" = produce absolute URL path, e.g. http://sitename.com/e107_plugins/etc
* TRUE = produce truncated URL path, e.g. e107plugins/etc * 'abs' = produce truncated URL path, e.g. e107plugins/etc
* "" (default) = URL's get relative path e.g. ../e107_plugins/etc * "" (default) = URL's get relative path e.g. ../e107_plugins/etc
* @param mixed $all [optional] if TRUE, then when $mode is "full" or TRUE, USERID is also replaced... * @param mixed $all [optional] if TRUE, then when $mode is "full" or TRUE, USERID is also replaced...
* when $mode is "" (default), ALL other e107 constants are replaced * when $mode is "" (default), ALL other e107 constants are replaced
@@ -1913,7 +1913,7 @@ class e_parse
$e107->getFolder('web_js'), $e107->getFolder('web_js'),
$e107->getFolder('web_css'), $e107->getFolder('web_css'),
$e107->getFolder('web_image'), $e107->getFolder('web_image'),
$e107->getFolder('web_pack'), //$e107->getFolder('web_pack'),
e_IMAGE_ABS, e_IMAGE_ABS,
e_THEME_ABS, e_THEME_ABS,
$e107->getFolder('images'), $e107->getFolder('images'),
@@ -1952,7 +1952,7 @@ class e_parse
e_FILE_ABS, e_FILE_ABS,
e_THEME_ABS, e_THEME_ABS,
// e_DOWNLOAD_ABS, //impossible when download is done via php. // e_DOWNLOAD_ABS, //impossible when download is done via php.
'', //no ABS path available '', // handlers - no ABS path available
e_MEDIA_ABS, e_MEDIA_ABS,
e_WEB_ABS, e_WEB_ABS,
defset('THEME_ABS'), defset('THEME_ABS'),
@@ -1982,7 +1982,7 @@ class e_parse
SITEURLBASE.e_FILE_ABS, // deprecated SITEURLBASE.e_FILE_ABS, // deprecated
SITEURLBASE.e_THEME_ABS, SITEURLBASE.e_THEME_ABS,
//SITEURL.$e107->getFolder('downloads'), //SITEURL.$e107->getFolder('downloads'),
'', //no ABS path available '', // handlers - no ABS path available
SITEURLBASE.e_MEDIA_ABS, SITEURLBASE.e_MEDIA_ABS,
SITEURLBASE.e_WEB_ABS, SITEURLBASE.e_WEB_ABS,
defset('THEME_ABS') ? SITEURLBASE.THEME_ABS : '', defset('THEME_ABS') ? SITEURLBASE.THEME_ABS : '',

5
e107_handlers/sitelinks_class.php
View File

@@ -1524,12 +1524,13 @@ class navigation_shortcodes extends e_shortcode
function sc_link_url($parm='') function sc_link_url($parm='')
{ {
return e_BASE. e107::getParser()->replaceConstants($this->var['link_url'], TRUE, TRUE); return e_BASE. e107::getParser()->replaceConstants($this->var['link_url'], 'full', TRUE);
} }
function sc_link_image($parm='') function sc_link_image($parm='')
{ {
return e107::getParser()->replaceConstants(vartrue($this->var['link_image'])); if (!vartrue($this->var['link_image'])) return '';
return e107::getParser()->replaceConstants($this->var['link_image'], 'full', TRUE);
} }