mirror of
https://github.com/e107inc/e107.git
synced 2025-08-04 21:57:51 +02:00
replacing of constants fixed
This commit is contained in:
@@ -3,9 +3,9 @@
|
|||||||
| e107 website system
|
| e107 website system
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.sc,v $
|
| $Source: /cvs_backup/e107_0.8/e107_files/shortcode/sitelinks_alt.sc,v $
|
||||||
| $Revision: 1.3 $
|
| $Revision: 1.4 $
|
||||||
| $Date: 2007-01-07 15:59:42 $
|
| $Date: 2007-03-16 13:47:59 $
|
||||||
| $Author: e107steved $
|
| $Author: mcfly_e107 $
|
||||||
+----------------------------------------------------------------------------+
|
+----------------------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -47,7 +47,7 @@
|
|||||||
global $tp;
|
global $tp;
|
||||||
|
|
||||||
$cat_link = (strpos($cat_link, '://') === FALSE) ? e_HTTP.$cat_link : $cat_link;
|
$cat_link = (strpos($cat_link, '://') === FALSE) ? e_HTTP.$cat_link : $cat_link;
|
||||||
$cat_link = $tp->replaceConstants($cat_link,TRUE);
|
$cat_link = $tp->replaceConstants($cat_link, '', TRUE);
|
||||||
|
|
||||||
if ($cat_open == 4 || $cat_open == 5){
|
if ($cat_open == 4 || $cat_open == 5){
|
||||||
$dimen = ($cat_open == 4) ? "600,400" : "800,600";
|
$dimen = ($cat_open == 4) ? "600,400" : "800,600";
|
||||||
@@ -104,7 +104,7 @@
|
|||||||
// Loops thru parents.--------->
|
// Loops thru parents.--------->
|
||||||
global $tp;
|
global $tp;
|
||||||
foreach ($linklist['head_menu'] as $lk) {
|
foreach ($linklist['head_menu'] as $lk) {
|
||||||
$lk['link_url'] = $tp -> replaceConstants($lk['link_url'],TRUE);
|
$lk['link_url'] = $tp -> replaceConstants($lk['link_url'], '', TRUE);
|
||||||
if ($params[0] == 'no_icons') {
|
if ($params[0] == 'no_icons') {
|
||||||
$link_icon = 'no_icons';
|
$link_icon = 'no_icons';
|
||||||
} else {
|
} else {
|
||||||
|
@@ -12,9 +12,9 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_handlers/sitelinks_class.php,v $
|
||||||
| $Revision: 1.5 $
|
| $Revision: 1.6 $
|
||||||
| $Date: 2007-02-13 23:24:36 $
|
| $Date: 2007-03-16 13:47:59 $
|
||||||
| $Author: e107coders $
|
| $Author: mcfly_e107 $
|
||||||
+---------------------------------------------------------------+
|
+---------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@@ -183,7 +183,7 @@ class sitelinks
|
|||||||
$indent = ($style['linkdisplay'] != 3) ? $style['subindent'] : "";
|
$indent = ($style['linkdisplay'] != 3) ? $style['subindent'] : "";
|
||||||
}
|
}
|
||||||
|
|
||||||
$linkInfo['link_url'] = $tp -> replaceConstants($linkInfo['link_url'],TRUE); // replace {e_xxxx}
|
$linkInfo['link_url'] = $tp -> replaceConstants($linkInfo['link_url'], '', TRUE); // replace {e_xxxx}
|
||||||
|
|
||||||
if(strpos($linkInfo['link_url'],"{") !== FALSE){
|
if(strpos($linkInfo['link_url'],"{") !== FALSE){
|
||||||
$linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage.
|
$linkInfo['link_url'] = $tp->parseTemplate($linkInfo['link_url'], TRUE); // shortcode in URL support - dynamic urls for multilanguage.
|
||||||
@@ -263,7 +263,7 @@ function hilite($link,$enabled=''){
|
|||||||
global $PLUGINS_DIRECTORY,$tp,$pref;
|
global $PLUGINS_DIRECTORY,$tp,$pref;
|
||||||
if(!$enabled){ return FALSE; }
|
if(!$enabled){ return FALSE; }
|
||||||
|
|
||||||
$link = $tp->replaceConstants($link,TRUE);
|
$link = $tp->replaceConstants($link, '', TRUE);
|
||||||
$tmp = explode("?",$link);
|
$tmp = explode("?",$link);
|
||||||
$link_qry = (isset($tmp[1])) ? $tmp[1] : "";
|
$link_qry = (isset($tmp[1])) ? $tmp[1] : "";
|
||||||
$link_slf = (isset($tmp[0])) ? $tmp[0] : "";
|
$link_slf = (isset($tmp[0])) ? $tmp[0] : "";
|
||||||
|
Reference in New Issue
Block a user