Merge

main/inc/global_error_message.inc.php

@@ -56,7 +56,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 	$css_base_file         = $css_path.'base.css';
 	$css_base_chamilo_file = $css_path.'base_chamilo.css';		
     
-    $css_list = array($css_file, $css_base_file, $css_base_chamilo_file, $bootstrap_file);
+    $css_list = array($css_base_file, $css_base_chamilo_file, $bootstrap_file, $css_file);
 
 	$root_sys = str_replace('\\', '/', realpath(dirname(__FILE__).'/../../')).'/';
 	$root_rel = htmlentities($_SERVER['PHP_SELF']);
@@ -195,7 +195,6 @@ if (is_int($global_error_code) && $global_error_code > 0) {
 						{CODE}
 				</div>
 			</div>
-
 			<div class="push"/></div>
 		</div>
 

main/newscorm/lp_add_item.php

@@ -162,20 +162,6 @@ if ((!$is_allowed_to_edit) || ($isStudentView)) {
     header('location:lp_controller.php?action=view&lp_id='.$learnpath_id);
     exit;
 }
-// From here on, we are admin because of the previous condition, so don't check anymore.
-$course_id = api_get_course_int_id();
-
-$tbl_lp = Database::get_course_table(TABLE_LP_MAIN);
-$sql_query = "SELECT * FROM $tbl_lp WHERE c_id = $course_id AND id = $learnpath_id";
-$result = Database::query($sql_query);
-$therow = Database::fetch_array($result);
-
-//$admin_output = '';
-/*
-    Course admin section
-    - all the functions not available for students - always available in this case (page only shown to admin)
-*/
-
 /* SHOWING THE ADMIN TOOLS */
 
 if (isset($_SESSION['gradebook'])) {
@@ -191,7 +177,7 @@ if (!empty($gradebook) && $gradebook == 'view') {
 
 
 $interbreadcrumb[] = array('url' => 'lp_controller.php?action=list', 'name' => get_lang('LearningPaths'));
-$interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => stripslashes("{$therow['name']}"));
+$interbreadcrumb[] = array('url' => api_get_self()."?action=build&lp_id=$learnpath_id", 'name' => $_SESSION['oLP']->get_name());
 
 switch ($type) {
     case 'chapter':
@@ -207,7 +193,6 @@ $show_learn_path = true;
 $lp_theme_css = $_SESSION['oLP']->get_theme();
 
 Display::display_header(null, 'Path');
-//api_display_tool_title($therow['name']);
 
 $suredel = trim(get_lang('AreYouSureToDelete'));
 //@todo move this somewhere else css/fix.css