Skip to content

Commit

Permalink
MDL-23310 fixed undefined page layouts
Browse files Browse the repository at this point in the history
  • Loading branch information
skodak committed Jul 15, 2010
1 parent 835d78f commit 897aa80
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion blog/external_blog_edit.php
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
}
$PAGE->set_url($url);
$PAGE->set_context($context);
$PAGE->set_pagelayout('general');
$PAGE->set_pagelayout('standard');

$returnurl = new moodle_url('/blog/external_blogs.php');

Expand Down
2 changes: 1 addition & 1 deletion blog/external_blogs.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

$PAGE->set_heading("$SITE->shortname: $strblogs: $strexternalblogs", $SITE->fullname);
$PAGE->set_title("$SITE->shortname: $strblogs: $strexternalblogs");
$PAGE->set_pagelayout('general');
$PAGE->set_pagelayout('standard');

echo $OUTPUT->header();
echo $OUTPUT->heading($strexternalblogs, 2);
Expand Down
8 changes: 4 additions & 4 deletions blog/lib.php
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ function blog_is_enabled_for_user() {
/**
* This function gets all of the options available for the current user in respect
* to blogs.
*
*
* It loads the following if applicable:
* - Module options {@see blog_get_options_for_module}
* - Course options {@see blog_get_options_for_course}
Expand Down Expand Up @@ -417,7 +417,7 @@ function blog_get_options_for_course(stdClass $course, stdClass $user=null) {
global $CFG, $USER;
// Cache
static $courseoptions = array();

$options = array();

// User must be logged in and blogs must be enabled
Expand All @@ -441,7 +441,7 @@ function blog_get_options_for_course(stdClass $course, stdClass $user=null) {
if (array_key_exists($key, $courseoptions)) {
return $courseoptions[$key];
}

if (has_capability('moodle/blog:view', get_context_instance(CONTEXT_COURSE, $course->id))) {
// We can view!
if ($CFG->bloglevel >= BLOG_SITE_LEVEL) {
Expand Down Expand Up @@ -648,7 +648,7 @@ function blog_get_headers() {
$course = $DB->get_record('course', array('id' => $group->courseid));
}

$PAGE->set_pagelayout('general');
$PAGE->set_pagelayout('standard');

if (!empty($modid) && $CFG->useblogassociations && has_capability('moodle/blog:associatemodule', $sitecontext)) { // modid always overrides courseid, so the $course object may be reset here
$headers['filters']['module'] = $modid;
Expand Down
2 changes: 1 addition & 1 deletion blog/preferences.php
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
}

$PAGE->set_url($url);
$PAGE->set_pagelayout('general');
$PAGE->set_pagelayout('standard');

if ($courseid == SITEID) {
require_login();
Expand Down

0 comments on commit 897aa80

Please sign in to comment.