Permalink
Browse files

MDL-31006 fix various notices in PHP54

PHP54 compatibility

Conflicts:

	lib/filterlib.php
	mod/feedback/lib.php
	report/participation/index.php
  • Loading branch information...
1 parent 58bdb2e commit bda9b6034be410824fc1f4d0689bb7544a76153a @skodak skodak committed with stronk7 Jan 15, 2012
View
1 admin/blocks.php
@@ -126,6 +126,7 @@
// Remove event handlers and dequeue pending events
events_uninstall('block/'.$block->name);
+ $a = new stdClass();
$a->block = $strblockname;
$a->directory = $CFG->dirroot.'/blocks/'.$block->name;
notice(get_string('blockdeletefiles', '', $a), 'blocks.php');
View
2 admin/enrol.php
@@ -31,6 +31,7 @@
$confirm = optional_param('confirm', 0, PARAM_BOOL);
$PAGE->set_url('/admin/enrol.php');
+$PAGE->set_context(context_system::instance());
require_login();
require_capability('moodle/site:config', get_context_instance(CONTEXT_SYSTEM));
@@ -107,6 +108,7 @@
} else { // Delete everything!!
uninstall_plugin('enrol', $enrol);
+ $a = new stdClass();
$a->plugin = $strplugin;
$a->directory = "$CFG->dirroot/enrol/$enrol";
echo $OUTPUT->notification(get_string('uninstalldeletefiles', 'enrol', $a), 'notifysuccess');
View
1 admin/modules.php
@@ -92,6 +92,7 @@
}
uninstall_plugin('mod', $delete);
+ $a = new stdClass();
$a->module = $strmodulename;
$a->directory = "$CFG->dirroot/mod/$delete";
echo $OUTPUT->notification(get_string("moduledeletefiles", "", $a), 'notifysuccess');
View
1 admin/qbehaviours.php
@@ -194,6 +194,7 @@
// Remove event handlers and dequeue pending events
events_uninstall('qbehaviour_' . $delete);
+ $a = new stdClass();
$a->behaviour = $behaviourname;
$a->directory = get_plugin_directory('qbehaviour', $delete);
echo $OUTPUT->box(get_string('qbehaviourdeletefiles', 'question', $a), 'generalbox', 'notice');
View
1 admin/qtypes.php
@@ -173,6 +173,7 @@
// Remove event handlers and dequeue pending events
events_uninstall('qtype_' . $delete);
+ $a = new stdClass();
$a->qtype = $qtypename;
$a->directory = $qtypes[$delete]->plugin_dir();
echo $OUTPUT->box(get_string('qtypedeletefiles', 'question', $a), 'generalbox', 'notice');
View
2 admin/timezoneimport.php
@@ -89,7 +89,7 @@
/// That's it!
if ($importdone) {
- $a = null;
+ $a = new stdClass();
$a->count = count($timezones);
$a->source = $importdone;
echo $OUTPUT->heading(get_string('importtimezonescount', 'admin', $a), 3);
View
1 blocks/admin_bookmarks/block_admin_bookmarks.php
@@ -79,6 +79,7 @@ function get_content() {
if ($this->contentgenerated === true) {
return $this->content;
}
+ $this->content = new stdClass();
if (get_user_preferences('admin_bookmarks')) {
require_once($CFG->libdir.'/adminlib.php');
View
14 blocks/comments/block_comments.php
@@ -48,21 +48,23 @@ function instance_allow_multiple() {
function get_content() {
global $CFG, $PAGE;
+ if ($this->content !== NULL) {
+ return $this->content;
+ }
if (!$CFG->usecomments) {
+ $this->content = new stdClass();
$this->content->text = '';
if ($this->page->user_is_editing()) {
$this->content->text = get_string('disabledcomments');
}
return $this->content;
}
- if ($this->content !== NULL) {
- return $this->content;
- }
- if (empty($this->instance)) {
- return null;
- }
+ $this->content = new stdClass();
$this->content->footer = '';
$this->content->text = '';
+ if (empty($this->instance)) {
+ return $this->content;
+ }
list($context, $course, $cm) = get_context_info_array($PAGE->context->id);
$args = new stdClass;
View
3 blocks/glossary_random/block_glossary_random.php
@@ -119,6 +119,7 @@ function get_content() {
global $USER, $CFG, $DB;
if (empty($this->config->glossary)) {
+ $this->content = new stdClass();
$this->content->text = get_string('notyetconfigured','block_glossary_random');
$this->content->footer = '';
return $this->content;
@@ -153,7 +154,7 @@ function get_content() {
return $this->content;
}
- $this->content = new stdClass;
+ $this->content = new stdClass();
$this->content->text = $this->config->cache;
// place link to glossary in the footer if the glossary is visible
View
3 blocks/html/edit_form.php
@@ -72,6 +72,9 @@ function set_data($defaults) {
unset($this->block->config->text);
parent::set_data($defaults);
// restore $text
+ if (!isset($this->block->config)) {
+ $this->block->config = new stdClass();
+ }
$this->block->config->text = $text;
if (isset($title)) {
// Reset the preserved title
View
1 blocks/login/block_login.php
@@ -43,6 +43,7 @@ function get_content () {
$username = get_moodle_cookie();
+ $this->content = new stdClass();
$this->content->footer = '';
$this->content->text = '';
View
2 blocks/mentees/block_mentees.php
@@ -25,6 +25,8 @@ function get_content() {
return $this->content;
}
+ $this->content = new stdClass();
+
// get all the mentees, i.e. users you have a direct assignment to
if ($usercontexts = $DB->get_records_sql("SELECT c.instanceid, c.instanceid, u.firstname, u.lastname
FROM {role_assignments} ra, {context} c, {user} u
View
1 blocks/navigation/block_navigation.php
@@ -195,6 +195,7 @@ function get_content() {
// Grab the items to display
$renderer = $this->page->get_renderer('block_navigation');
+ $this->content = new stdClass();
$this->content->text = $renderer->navigation_tree($navigation, $expansionlimit, $options);
// Set content generated to true so that we know it has been done
View
1 blocks/private_files/block_private_files.php
@@ -51,6 +51,7 @@ function get_content() {
return null;
}
+ $this->content = new stdClass();
$this->content->text = '';
$this->content->footer = '';
if (isloggedin() && !isguestuser()) { // Show the block
View
1 blocks/settings/block_settings.php
@@ -129,6 +129,7 @@ function get_content() {
}
$renderer = $this->page->get_renderer('block_settings');
+ $this->content = new stdClass();
$this->content->text = $renderer->settings_tree($this->page->settingsnav);
// only do search if you have moodle/site:config
View
4 blocks/tags/block_tags.php
@@ -47,6 +47,10 @@ function get_content() {
return $this->content;
}
+ if (!isset($this->config)) {
+ $this->config = new stdClass();
+ }
+
if (empty($this->config->numberoftags)) {
$this->config->numberoftags = 80;
}
View
1 calendar/lib.php
@@ -1540,6 +1540,7 @@ function calendar_set_event_type_display($type, $display = null, $user = null) {
function calendar_get_allowed_types(&$allowed, $course = null) {
global $USER, $CFG, $DB;
+ $allowed = new stdClass();
$allowed->user = has_capability('moodle/calendar:manageownentries', get_system_context());
$allowed->groups = false; // This may change just below
$allowed->courses = false; // This may change just below
View
2 course/format/weeks/format.php
@@ -141,7 +141,7 @@
$thissection = $sections[$section];
} else {
- unset($thissection);
+ $thissection = new stdClass();
$thissection->course = $course->id; // Create a new week structure
$thissection->section = $section;
$thissection->name = null;
View
1 course/index.php
@@ -373,6 +373,7 @@ function print_category_edit($category, $displaylist, $parentslist, $depth=-1, $
echo '</td>';
echo '</tr>';
} else {
+ $category = new stdClass();
$category->id = '0';
}
View
6 course/lib.php
@@ -1086,6 +1086,7 @@ function get_array_of_activities($courseid) {
if (empty($rawmods[$seq])) {
continue;
}
+ $mod[$seq] = new stdClass();
$mod[$seq]->id = $rawmods[$seq]->instance;
$mod[$seq]->cm = $rawmods[$seq]->id;
$mod[$seq]->mod = $rawmods[$seq]->modname;
@@ -2111,6 +2112,7 @@ function print_whole_category_list($category=NULL, $displaylist=NULL, $parentsli
}
} else {
+ $category = new stdClass();
$category->id = "0";
}
@@ -2478,7 +2480,7 @@ function print_course($course, $highlightterms = '') {
echo html_writer::end_tag('div'); // End of info div
echo html_writer::start_tag('div', array('class'=>'summary'));
- $options = NULL;
+ $options = new stdClass();
$options->noclean = true;
$options->para = false;
$options->overflowdiv = true;
@@ -2625,7 +2627,7 @@ function print_remote_course($course, $width="100%") {
. format_string($course->cat_name) . ' : '
. format_string($course->shortname). '</div>';
echo '</div><div class="summary">';
- $options = NULL;
+ $options = new stdClass();
$options->noclean = true;
$options->para = false;
$options->overflowdiv = true;
View
2 lib/blocklib.php
@@ -1676,7 +1676,7 @@ function generate_page_type_patterns($pagetype, $parentcontext = null, $currentc
// Ensure that the * pattern is always available if editing block 'at distance', so
// we always can 'bring back' it to the original context. MDL-30340
- if ($currentcontext->id != $parentcontext->id && !isset($patterns['*'])) {
+ if ((!isset($currentcontext) or !isset($parentcontext) or $currentcontext->id != $parentcontext->id) && !isset($patterns['*'])) {
// TODO: We could change the string here, showing its 'bring back' meaning
$patterns['*'] = get_string('page-x', 'pagetype');
}
View
2 lib/datalib.php
@@ -1232,7 +1232,7 @@ function get_my_remotehosts() {
function make_default_scale() {
global $DB;
- $defaultscale = NULL;
+ $defaultscale = new stdClass();
$defaultscale->courseid = 0;
$defaultscale->userid = 0;
$defaultscale->name = get_string('separateandconnected');
View
3 lib/filelib.php
@@ -128,6 +128,9 @@ function file_prepare_standard_editor($data, $field, array $options, $context=nu
if (is_null($itemid) or is_null($context)) {
$contextid = null;
$itemid = null;
+ if (!isset($data)) {
+ $data = new stdClass();
+ }
if (!isset($data->{$field})) {
$data->{$field} = '';
}
View
4 lib/formslib.php
@@ -2441,6 +2441,10 @@ function validate($value, $options = null) {
if (is_array($value) && array_key_exists('text', $value)) {
$value = $value['text'];
}
+ if (is_array($value)) {
+ // nasty guess - there has to be something in the array, hopefully nobody invents arrays in arrays
+ $value = implode('', $value);
+ }
$stripvalues = array(
'#</?(?!img|canvas|hr).*?>#im', // all tags except img, canvas and hr
'#(\xc2|\xa0|\s|&nbsp;)#', //any whitespaces actually
View
3 lib/moodlelib.php
@@ -1076,7 +1076,7 @@ function get_config($plugin, $name = NULL) {
if ($localcfg) {
return (object)$localcfg;
} else {
- return null;
+ return new stdClass();
}
} else {
@@ -1626,6 +1626,7 @@ function format_time($totalsecs, $str=NULL) {
$totalsecs = abs($totalsecs);
if (!$str) { // Create the str structure the slow way
+ $str = new stdClass();
$str->day = get_string('day');
$str->days = get_string('days');
$str->hour = get_string('hour');
View
4 login/index.php
@@ -285,6 +285,10 @@
/// Generate the login page with forms
+if (!isset($frm) or !is_object($frm)) {
+ $frm = new stdClass();
+}
+
if (empty($frm->username) && $authsequence[0] != 'shibboleth') { // See bug 5184
if (!empty($_GET["username"])) {
$frm->username = $_GET["username"];
View
1 message/lib.php
@@ -1342,6 +1342,7 @@ function message_contact_link($userid, $linktype='add', $return=false, $script=n
}
if (empty($str->blockcontact)) {
+ $str = new stdClass();
$str->blockcontact = get_string('blockcontact', 'message');
$str->unblockcontact = get_string('unblockcontact', 'message');
$str->removecontact = get_string('removecontact', 'message');
View
2 mod/chat/lib.php
@@ -112,7 +112,7 @@ function chat_add_instance($chat) {
$returnid = $DB->insert_record("chat", $chat);
- $event = NULL;
+ $event = new stdClass();
$event->name = $chat->name;
$event->description = format_module_intro('chat', $chat, $chat->coursemodule);
$event->courseid = $chat->course;
View
8 mod/feedback/lib.php
@@ -654,8 +654,8 @@ function feedback_set_events($feedback) {
}
// the open-event
- if($feedback->timeopen > 0) {
- $event = NULL;
+ if ($feedback->timeopen > 0) {
+ $event = new stdClass();
$event->name = get_string('start', 'feedback').' '.$feedback->name;
$event->description = format_module_intro('feedback', $feedback, $feedback->coursemodule);
$event->courseid = $feedback->course;
@@ -676,8 +676,8 @@ function feedback_set_events($feedback) {
}
// the close-event
- if($feedback->timeclose > 0) {
- $event = NULL;
+ if ($feedback->timeclose > 0) {
+ $event = new stdClass();
$event->name = get_string('stop', 'feedback').' '.$feedback->name;
$event->description = format_module_intro('feedback', $feedback, $feedback->coursemodule);
$event->courseid = $feedback->course;
View
1 mod/forum/lib.php
@@ -2918,6 +2918,7 @@ function forum_get_course_forum($courseid, $type) {
}
// Doesn't exist, so create one now.
+ $forum = new stdClass();
$forum->course = $courseid;
$forum->type = "$type";
switch ($forum->type) {
View
1 mod/forum/post.php
@@ -792,6 +792,7 @@
print_error('cannotfindparentpost', 'forum', '', $post->id);
}
} else {
+ $toppost = new stdClass();
$toppost->subject = ($forum->type == "news") ? get_string("addanewtopic", "forum") :
get_string("addanewdiscussion", "forum");
}
View
3 user/index.php
@@ -103,6 +103,7 @@
$strnever = get_string('never');
+ $datestring = new stdClass();
$datestring->year = get_string('year');
$datestring->years = get_string('years');
$datestring->day = get_string('day');
@@ -468,6 +469,7 @@
}
if ($roleid > 0) {
+ $a = new stdClass();
$a->number = $totalcount;
$a->role = $rolenames[$roleid];
$heading = format_string(get_string('xuserswiththerole', 'role', $a));
@@ -483,6 +485,7 @@
}
$heading .= ": $a->number";
+
if (user_can_assign($context, $roleid)) {
$heading .= ' <a href="'.$CFG->wwwroot.'/'.$CFG->admin.'/roles/assign.php?roleid='.$roleid.'&amp;contextid='.$context->id.'">';
$heading .= '<img src="'.$OUTPUT->pix_url('i/edit') . '" class="icon" alt="" /></a>';

0 comments on commit bda9b60

Please sign in to comment.