From 9c2b6d42db92a19cf65584161b1e3b4f4e7b3436 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <yannick.warnier@beeznest.com>
Date: Wed, 14 Jan 2009 15:52:30 +0100
Subject: [PATCH] [svn r17718] Fixed specific fields loading when search not
 enabled

---
 main/upload/upload_ppt.php  | 28 +++++++++++++++-------------
 main/upload/upload_word.php | 28 ++++++++++++++++------------
 2 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/main/upload/upload_ppt.php b/main/upload/upload_ppt.php
index b8c5a28fc6..b8e7c163e3 100644
--- a/main/upload/upload_ppt.php
+++ b/main/upload/upload_ppt.php
@@ -19,7 +19,6 @@ include("../inc/global.inc.php");
 require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
 require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
-require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
 		
 
@@ -48,7 +47,6 @@ $htmlHeadXtra[] = '<script type="text/javascript">
 	var myUpload = new upload(0);
 </script>';
 $htmlHeadXtra[] = $form_style;
-$specific_fields = get_specific_field_list();
 
 if(isset($_POST['convert'])){
 	$cwdir = getcwd();
@@ -59,17 +57,21 @@ if(isset($_POST['convert'])){
 		{
 			require('../newscorm/lp_upload.php');
 			if(isset($o_ppt) && $first_item_id != 0){
-				foreach ($specific_fields as $specific_field) {
-					$values = explode(',', trim($_POST[$specific_field['code']]));
-					if ( !empty($values) ) {
-						foreach ($values as $value) {
-							$value = trim($value);
-							if ( !empty($value) ) {
-								add_specific_field_value($specific_field['id'], api_get_course_id(), TOOL_LEARNPATH, $o_ppt->lp_id, $value);
-							}
-						}
-					}
-				}
+				if (api_get_setting('search_enabled')=='true') {
+                    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+                    $specific_fields = get_specific_field_list();                    
+                    foreach ($specific_fields as $specific_field) {
+    					$values = explode(',', trim($_POST[$specific_field['code']]));
+    					if ( !empty($values) ) {
+    						foreach ($values as $value) {
+    							$value = trim($value);
+    							if ( !empty($value) ) {
+    								add_specific_field_value($specific_field['id'], api_get_course_id(), TOOL_LEARNPATH, $o_ppt->lp_id, $value);
+    							}
+    						}
+    					}
+    				}
+                }
 				header('Location: ../newscorm/lp_controller.php?'.api_get_cidreq().'&lp_id='.$o_ppt->lp_id.'&action=view_item&id='.$first_item_id);
 			}
 			else {
diff --git a/main/upload/upload_word.php b/main/upload/upload_word.php
index 58e18c0ae9..57b0c51686 100644
--- a/main/upload/upload_word.php
+++ b/main/upload/upload_word.php
@@ -20,7 +20,6 @@ require_once(api_get_path(LIBRARY_PATH) . 'fileUpload.lib.php');
 require_once(api_get_path(LIBRARY_PATH) . 'events.lib.inc.php');
 require_once(api_get_path(LIBRARY_PATH) . 'document.lib.php');
 require_once (api_get_path(LIBRARY_PATH).'formvalidator/FormValidator.class.php');
-require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
 		
 
 $form_style= '
@@ -52,17 +51,22 @@ if(isset($_POST['convert'])){
 		{
 			require('../newscorm/lp_upload.php');
 			if(isset($o_doc) && $first_item_id != 0){
-				foreach ($specific_fields as $specific_field) {
-					$values = explode(',', trim($_POST[$specific_field['code']]));
-					if ( !empty($values) ) {
-						foreach ($values as $value) {
-							$value = trim($value);
-							if ( !empty($value) ) {
-								add_specific_field_value($specific_field['id'], api_get_course_id(), TOOL_LEARNPATH, $o_doc->lp_id, $value);
-							}
-						}
-					}
-				}
+                if (api_get_setting('search_enabled')=='true') {
+                    require_once(api_get_path(LIBRARY_PATH) . 'specific_fields_manager.lib.php');
+                    $specific_fields = get_specific_field_list();                    
+                
+    				foreach ($specific_fields as $specific_field) {
+    					$values = explode(',', trim($_POST[$specific_field['code']]));
+    					if ( !empty($values) ) {
+    						foreach ($values as $value) {
+    							$value = trim($value);
+    							if ( !empty($value) ) {
+    								add_specific_field_value($specific_field['id'], api_get_course_id(), TOOL_LEARNPATH, $o_doc->lp_id, $value);
+    							}
+    						}
+    					}
+    				}
+                }
 				header('Location: ../newscorm/lp_controller.php?'.api_get_cidreq().'&lp_id='.$o_doc->lp_id.'&action=view_item&id='.$first_item_id);
 			}
 			else {