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

[Bart M]

    Date: Friday, December 30, 2005 @ 12:01:05
  Author: pseudopunk
    Path: /cvsroot/sf-active/sf-active/sf-active/shared/classes/pages

Modified: feature_display_edit.inc

makes article->feature work again (closes bug 362)


Index: sf-active/sf-active/shared/classes/pages/feature_display_edit.inc
diff -u sf-active/sf-active/shared/classes/pages/feature_display_edit.inc:1.18 sf-active/sf-active/shared/classes/pages/feature_display_edit.inc:1.19
--- sf-active/sf-active/shared/classes/pages/feature_display_edit.inc:1.18	Wed Dec 28 09:13:35 2005
+++ sf-active/sf-active/shared/classes/pages/feature_display_edit.inc	Fri Dec 30 12:01:04 2005
@@ -19,9 +19,9 @@
      */
     function execute()
     {
-
+	if($GLOBALS['build']['clear_path'] == true) { $lang = ''; } else { $lang = $GLOBALS['lang'].'/'; }
     	$this->tkeys['language_options'] = $this->get_cached_var('language_options');
-	$this->tkeys['template_options'] = $this->get_cached_var('temp_options',SF_INCLUDE_PATH."/".$GLOBALS['lang']."/select_templates.inc");
+	$this->tkeys['template_options'] = $this->get_cached_var('temp_options', SF_INCLUDE_PATH."/".$lang."select_templates.inc");
 	
 	$category_id = $_SESSION['category_id'];
 	$article_id = $_GET['article_id'];
@@ -73,12 +73,10 @@
 			// map the article fields to feature fields
 			// this should maybe be reduced to one query from
 			// 3...
-
-
 			require_once(SF_CLASS_PATH . '/webcast/webcast_class.inc');
 			require_once(SF_CLASS_PATH . '/webcast/webcast_media_class.inc');
 			require_once(SF_CLASS_PATH . '/webcast/webcast_text_class.inc');
-			
+			$this->tkeys['category_options'] = $this->get_cached_var('feature_options'); 
 			$this->tkeys['promote'] = true ;
 			$webcast = new Webcast();
 			$webcast->load_from_id($article_id);