[imc-sf-coders] CVS update of sf-active/sf-active/shared/classes/smarty (1 file)

[Bart M]

    Date: Wednesday, December 28, 2005 @ 13:58:12
  Author: pseudopunk
    Path: /cvsroot/sf-active/sf-active/sf-active/shared/classes/smarty

Modified: function.sf_link.php

avoid //


Index: sf-active/sf-active/shared/classes/smarty/function.sf_link.php
diff -u sf-active/sf-active/shared/classes/smarty/function.sf_link.php:1.11 sf-active/sf-active/shared/classes/smarty/function.sf_link.php:1.12
--- sf-active/sf-active/shared/classes/smarty/function.sf_link.php:1.11	Sun Jun 19 12:12:49 2005
+++ sf-active/sf-active/shared/classes/smarty/function.sf_link.php	Wed Dec 28 13:58:12 2005
@@ -25,22 +25,23 @@
 	if(is_int($params['lang']) || is_numeric($params['lang'])){
 	    $lang = Language::get_language_code($params['lang']);
 	}else{
-	    $lang = $params['lang'];
+	    $lang = '/'.$params['lang'];
+	    if($GLOBALS['build']['clear_path'] == true) $lang = '';
 	}
 	
 	switch ($params['type']) {
 	
 		case 'article':
-			return SF_ROOT_URL.'/'.$lang.SF_NEWS_EXT . $date_string . $params['id'] . '.php';
+			return SF_ROOT_URL.$lang.SF_NEWS_EXT . $date_string . $params['id'] . '.php';
 			break;
 		case 'article-rel':
 			return SF_NEWS_EXT.$date_string . $params['id'] . '.php';
 			break;
 		case 'archive':
-			return SF_ROOT_URL.'/'.$lang.'/'.SF_ARCHIVE_EXT.$date_string.$params['id'].'.php';
+			return SF_ROOT_URL.$lang.'/'.SF_ARCHIVE_EXT.$date_string.$params['id'].'.php';
 			break;
 		case 'comment':
-			return SF_ROOT_URL.'/'.$lang.SF_NEWS_EXT . $date_string . $params['id'] . '_comment.php';
+			return SF_ROOT_URL.$lang.SF_NEWS_EXT . $date_string . $params['id'] . '_comment.php';
 			break;
 		case 'article-edit':
 			return SF_ADMIN_URL.'/article/article_edit.php?id='.$params['id'];
@@ -51,7 +52,7 @@
 		case 'article-promote':
 			return SF_ADMIN_URL."/feature/feature_display_edit.php?article_id=".$params['id'];
 		case 'event':
-			return SF_ROOT_URL.'/'.$lang.SF_CALENDAR_EXT.$date_string . $params['id'] . '.php';
+			return SF_ROOT_URL.$lang.SF_CALENDAR_EXT.$date_string . $params['id'] . '.php';
 			break;
 		case 'file':
 			return SF_UPLOAD_URL.$date_string.basename($params['id']);