Bläddra i källkod

Merge

Hg: user: Noel Dieschburg <noel.dieschburg@dokeos.com>
Noel Dieschburg 15 år sedan
förälder
incheckning
8956596a1d

+ 1 - 1
main/inc/lib/blog.lib.php

@@ -765,7 +765,7 @@ class Blog {
 				$blog_post_time = date('H:i',strtotime($blog_post['date_creation']));
 
 				// Create an introduction text (but keep FULL sentences)
-				$limit = 100; //nmbr of words in introduction text
+				$limit = api_get_setting('read_more_limit'); //nmbr of words in introduction text
 				$introduction_text = "";
 				$words = 0;
 				$tok = strtok(make_clickable(stripslashes($blog_post['full_text'])), " ");

+ 3 - 2
main/inc/lib/course.lib.php

@@ -1037,7 +1037,8 @@ class CourseManager {
 		$virtual_course_list = self::get_virtual_courses_linked_to_real_course($course_code);
 
 		//get users from real course
-		$user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id);
+		$user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id,'',api_get_setting('user_order_by'));
+
 		foreach ($user_list as $this_user) {
 			$complete_user_list[] = $this_user;
 		}
@@ -1045,7 +1046,7 @@ class CourseManager {
 		//get users from linked courses
 		foreach ($virtual_course_list as $this_course) {
 			$course_code = $this_course['code'];
-			$user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id);
+			$user_list = self::get_user_list_from_course_code($course_code, $with_sessions, $session_id,'',api_get_setting('user_order_by'));
 			foreach ($user_list as $this_user) {
 				$complete_user_list[] = $this_user;
 			}

+ 3 - 0
main/install/migrate-db-1.8.6.1-1.8.6.2-pre.sql

@@ -70,6 +70,9 @@ INSERT INTO settings_current (variable, subkey, type, category, selected_value,
 INSERT INTO settings_options (variable, value, display_text) VALUES ('user_order_by','firstname','FirstName');
 INSERT INTO settings_options (variable, value, display_text) VALUES ('user_order_by','lastname','LastName');
 
+INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('read_more_limit', NULL , 'textfield', 'Tools', '100', 'ReadMoreLimitTitle', 'ReadMoreLimitComment', NULL , NULL , '1');
+
+
 -- xxSTATSxx
 ALTER TABLE track_e_exercices ADD COLUMN expired_time_control datetime NOT NULL DEFAULT '0000-00-00 00:00:00';
 ALTER TABLE track_e_online ADD INDEX (course);