[svn r13775] when editing a subdirectory, the parent was not selected

main/newscorm/learnpath.class.php

@@ -4251,7 +4251,7 @@ class learnpath {
 					{
 						$return .= $this->display_manipulate($item_id, $row['item_type']);
 						$return .= $this->display_item_form($row['item_type'], get_lang("EditCurrentChapter").' :', 'edit', $item_id, $row);
-					}
+						}
 					else
 					{
 						$return .= $this->display_item_small_form($row['item_type'], get_lang("EditCurrentChapter").' :', $row);
@@ -5535,9 +5535,12 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '')
 			{
 				if($action != 'add'){
 					if(($arrLP[$i]['item_type'] == 'dokeos_module' || $arrLP[$i]['item_type'] == 'dokeos_chapter' || $arrLP[$i]['item_type'] == 'dir') && !in_array($arrLP[$i]['id'], $arrHide) && !in_array($arrLP[$i]['parent_item_id'], $arrHide)){
-						$arrHide[$arrLP[$i]['id']]['value']=html_entity_decode(stripslashes($arrLP[$i]['title']));
-						$arrHide[$arrLP[$i]['id']]['padding']=3+ $arrLP[$i]['depth'] * 10;
-						if($parent == $arrLP[$i]['id']){
+						if($arrLP[$i]['id'] != $id)
+						{
+							$arrHide[$arrLP[$i]['id']]['value']=html_entity_decode(stripslashes($arrLP[$i]['title']));
+							$arrHide[$arrLP[$i]['id']]['padding']=3+ $arrLP[$i]['depth'] * 10;
+						}
+						if($parent == $arrLP[$i]['id']){;
 							$s_selected_parent=$arrHide[$arrLP[$i]['id']];
 						}
 					}
@@ -5552,13 +5555,12 @@ function display_thread_form($action = 'add', $id = 0, $extra_info = '')
 					}
 				}
 			}
-			
 			$parent_select = &$form->addElement('select', 'parent', get_lang("Parent")." :", '', 'style="background:#F8F8F8; border:1px solid #999999; font-family:Arial, Verdana, Helvetica, sans-serif; font-size:12px; width:300px;" onchange="load_cbo(this.value);"');
 
 			foreach($arrHide as $key => $value){
 				$parent_select->addOption($value['value'],$key,'style="padding-left:'.$value['padding'].'px;"');
 			}
-			$parent_select -> setSelected($s_selected_parent);
+			$parent_select -> setSelected($parent);
 			
 			
 		}