mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-14 13:02:07 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-33624' of git://github.com/danpoltawski/moodle

Browse Source
This commit is contained in:
Sam Hemelryk 2012-07-16 13:51:07 +12:00
commit 775d977710
8 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
blog/index.php
View File

@ -143,7 +143,7 @@ if (!empty($groupid)) {
}
if (!$course = $DB->get_record('course', array('id'=>$group->courseid))) {
print_error(get_string('invalidcourseid', 'blog'));
print_error('invalidcourseid');
}
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);

4
course/delete.php
View File

@ -18,11 +18,11 @@
$strcategories = get_string("categories");
if (! $course = $DB->get_record("course", array("id"=>$id))) {
print_error("invalidcourseid", 'error', '', $id);
print_error("invalidcourseid");
}
if ($site->id == $course->id) {
// can not delete frontpage!
print_error("invalidcourseid", 'error', '', $id);
print_error("invalidcourseid");
}
$coursecontext = get_context_instance(CONTEXT_COURSE, $course->id);

2
course/externallib.php
View File

@ -722,7 +722,7 @@ class core_course_external extends external_api {
// Context validation.
if (! ($course = $DB->get_record('course', array('id'=>$params['courseid'])))) {
throw new moodle_exception('invalidcourseid', 'error', '', $params['courseid']);
throw new moodle_exception('invalidcourseid', 'error');
}
// Category where duplicated course is going to be created.

2
enrol/authorize/index.php
View File

@ -53,7 +53,7 @@
/// Get course
if (!($course = $DB->get_record('course', array('id'=>$courseid)))) {
print_error('invalidcourseid', '', '', $courseid);
print_error('invalidcourseid');
}
/// Only SITE users can access to this page

2
lang/en/error.php
View File

@ -280,7 +280,7 @@ $string['invalidcomponent'] = 'Invalid component name';
$string['invalidconfirmdata'] = 'Invalid confirmation data';
$string['invalidcontext'] = 'Invalid context';
$string['invalidcourse'] = 'Invalid course';
$string['invalidcourseid'] = 'You are trying to use an invalid course ID: ({$a})';
$string['invalidcourseid'] = 'You are trying to use an invalid course ID';
$string['invalidcourselevel'] = 'Incorrect context level';
$string['invalidcoursemodule'] = 'Invalid course module ID';
$string['invalidcoursenameshort'] = 'Invalid short course name';

1
lang/en/notes.php
View File

@ -37,7 +37,6 @@ $string['deletenotes'] = 'Delete all notes';
$string['editnote'] = 'Edit note';
$string['enablenotes'] = 'Enable notes';
$string['groupaddnewnote'] = 'Add a common note';
$string['invalidcourseid'] = 'Invalid course id: {$a}';
$string['invalidid'] = 'Invalid note ID specified';
$string['invaliduserid'] = 'Invalid user id: {$a}';
$string['nocontent'] = 'Note content can not be empty';

2
mod/data/export.php
View File

@ -41,7 +41,7 @@ if (! $cm = get_coursemodule_from_instance('data', $data->id, $data->course)) {
}
if(! $course = $DB->get_record('course', array('id'=>$cm->course))) {
print_error('invalidcourseid', '', '', $cm->course);
print_error('invalidcourseid');
}
// fill in missing properties needed for updating of instance

2
notes/externallib.php
View File

@ -110,7 +110,7 @@ class core_notes_external extends external_api {
//check the course exists
if (empty($courses[$note['courseid']])) {
$success = false;
$errormessage = get_string('invalidcourseid', 'notes', $note['courseid']);
$errormessage = get_string('invalidcourseid', 'error');
} else {
// Ensure the current user is allowed to run this function
$context = get_context_instance(CONTEXT_COURSE, $note['courseid']);