[svn r18570] fix a small bug and group behavior

main/inc/lib/fckeditor/editor/plugins/ajaxfilemanager/ajax_file_upload.php

@@ -81,14 +81,16 @@
 									{
 										$dokeosFolder=$group_properties['directory'].$dokeosFolder;//get Dokeos
 									}
-									if(api_is_allowed_to_edit())
-									{
-										$doc_id = add_document($_course, $dokeosFolder,'file', $dokeosFileSize , $dokeosFile); //get Dokeos																								
-									}
 									else
 									{
-										$doc_id = add_document($_course, '/shared_folder/'.$dokeosFolder,'file', $dokeosFileSize , $dokeosFile); //get Dokeos
+										if(!api_is_allowed_to_edit())
+										{
+											$dokeosFolder='/shared_folder/'.$dokeosFolder;
+										}						
 									}
+									
+									$doc_id = add_document($_course, $dokeosFolder,'file', $dokeosFileSize , $dokeosFile); //get Dokeos																		
+								
 									api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', api_get_user_id(),$to_group_id);//get Dokeos
 								}
 								

main/inc/lib/fckeditor/repositories_config.php

@@ -155,5 +155,4 @@ if (api_is_in_course())
 	}
 }
 
-?>
->>>>>>> .r18557
+?>