From e4cc5300a6f5b4fc528ffae85f52afb451a5abf2 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Tue, 27 Dec 2011 09:32:37 -0500 Subject: [PATCH] Few fixes for single database mode --- main/exercice/exercise.class.php | 2 +- main/inc/lib/specific_fields_manager.lib.php | 2 +- main/link/link.php | 2 +- main/newscorm/lp_edit.php | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) mode change 100755 => 100644 main/inc/lib/specific_fields_manager.lib.php diff --git a/main/exercice/exercise.class.php b/main/exercice/exercise.class.php index 231f26d051..1bb0b4cbeb 100644 --- a/main/exercice/exercise.class.php +++ b/main/exercice/exercise.class.php @@ -1075,7 +1075,7 @@ class Exercise { foreach ($specific_fields as $specific_field) { $form->addElement ('text', $specific_field['code'], $specific_field['name']); - $filter = array('course_code'=> "'". api_get_course_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => $this->id, 'tool_id' => '\''. TOOL_QUIZ .'\''); + $filter = array('c_id'=> "'". api_get_course_int_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => $this->id, 'tool_id' => '\''. TOOL_QUIZ .'\''); $values = get_specific_field_values_list($filter, array('value')); if ( !empty($values) ) { $arr_str_values = array(); diff --git a/main/inc/lib/specific_fields_manager.lib.php b/main/inc/lib/specific_fields_manager.lib.php old mode 100755 new mode 100644 index a1be0a6cc8..db5f75968c --- a/main/inc/lib/specific_fields_manager.lib.php +++ b/main/inc/lib/specific_fields_manager.lib.php @@ -134,7 +134,7 @@ function get_specific_field_values_list_by_prefix($prefix, $course_code, $tool_i $table_sf = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD); $table_sfv = Database :: get_main_table(TABLE_MAIN_SPECIFIC_FIELD_VALUES); $sql = 'SELECT sfv.value FROM %s sf LEFT JOIN %s sfv ON sf.id = sfv.field_id' . - ' WHERE sf.code = \'%s\' AND sfv.course_code = \'%s\' AND tool_id = \'%s\' AND sfv.ref_id = %s'; + ' WHERE sf.code = \'%s\' AND sfv.c_id = \'%s\' AND tool_id = \'%s\' AND sfv.ref_id = %s'; $sql = sprintf($sql, $table_sf, $table_sfv, $prefix, $course_code, $tool_id, $ref_id); $sql_result = Database::query($sql); while ($result = Database::fetch_array($sql_result)) { diff --git a/main/link/link.php b/main/link/link.php index 99c6e3456c..b8cf379233 100644 --- a/main/link/link.php +++ b/main/link/link.php @@ -314,7 +314,7 @@ if (api_is_allowed_to_edit(null, true) && isset($_GET['action'])) { foreach ($specific_fields as $specific_field) { $default_values = ''; if ($_GET['action'] == 'editlink') { - $filter = array('course_code'=> "'". api_get_course_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => Security::remove_XSS($_GET['id']), 'tool_id' => '\''. TOOL_LINK .'\''); + $filter = array('c_id'=> "'". api_get_course_int_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => Security::remove_XSS($_GET['id']), 'tool_id' => '\''. TOOL_LINK .'\''); $values = get_specific_field_values_list($filter, array('value')); if (!empty($values)) { $arr_str_values = array(); diff --git a/main/newscorm/lp_edit.php b/main/newscorm/lp_edit.php index c021d17137..9dc996d521 100644 --- a/main/newscorm/lp_edit.php +++ b/main/newscorm/lp_edit.php @@ -165,7 +165,7 @@ if (api_get_setting('search_enabled') === 'true') { $specific_fields = get_specific_field_list(); foreach ($specific_fields as $specific_field) { $form -> addElement ('text', $specific_field['code'], $specific_field['name']); - $filter = array('course_code'=> "'". api_get_course_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => $_SESSION['oLP']->lp_id, 'tool_id' => '\''. TOOL_LEARNPATH .'\''); + $filter = array('c_id'=> "'". api_get_course_int_id() ."'", 'field_id' => $specific_field['id'], 'ref_id' => $_SESSION['oLP']->lp_id, 'tool_id' => '\''. TOOL_LEARNPATH .'\''); $values = get_specific_field_values_list($filter, array('value')); if (!empty($values)) { $arr_str_values = array();