MDL-24321 switching to stdClass in /user/

robjoyce · Sep 21, 2010 · bf718f5 · bf718f5
1 parent c213773
commit bf718f5
Show file tree

Hide file tree

Showing 17 changed files with 22 additions and 22 deletions.
diff --git a/user/addnote.php b/user/addnote.php
@@ -52,7 +52,7 @@
         print_error('invalidformdata', '', $CFG->wwwroot.'/user/index.php?id='.$id);
     }
 
-    $note = new object();
+    $note = new stdClass();
     $note->courseid = $id;
     $note->format = FORMAT_PLAIN;
     foreach ($users as $k => $v) {

diff --git a/user/editadvanced.php b/user/editadvanced.php
@@ -60,7 +60,7 @@
 
 if ($id == -1) {
     // creating new user
-    $user = new object();
+    $user = new stdClass();
     $user->id = -1;
     $user->auth = 'manual';
     $user->confirmed = 1;

diff --git a/user/editlib.php b/user/editlib.php
@@ -87,7 +87,7 @@ function useredit_shared_definition(&$mform, $editoroptions = null) {
 
     $strrequired = get_string('required');
 
-    $nameordercheck = new object();
+    $nameordercheck = new stdClass();
     $nameordercheck->firstname = 'a';
     $nameordercheck->lastname  = 'b';
     if (fullname($nameordercheck) == 'b a' ) {  // See MDL-4325

diff --git a/user/filesedit.php b/user/filesedit.php
@@ -55,7 +55,7 @@
 $PAGE->set_pagelayout('mydashboard');
 $PAGE->set_pagetype('user-files');
 
-$data = new object();
+$data = new stdClass();
 $data->returnurl = $returnurl;
 $options = array('subdirs'=>1, 'maxbytes'=>$CFG->userquota, 'maxfiles'=>-1, 'accepted_types'=>'*', 'return_types'=>FILE_INTERNAL);
 file_prepare_standard_filemanager($data, 'files', $options, $context, 'user', 'private', 0);

diff --git a/user/filters/courserole.php b/user/filters/courserole.php
@@ -127,7 +127,7 @@ function get_label($data) {
         $roleid     = $data['roleid'];
         $categoryid = $data['categoryid'];
 
-        $a = new object();
+        $a = new stdClass();
         $a->label = $this->_label;
 
         if ($roleid) {

diff --git a/user/filters/date.php b/user/filters/date.php
@@ -134,7 +134,7 @@ function get_label($data) {
         $never = $data['never'];
         $field  = $this->_field;
 
-        $a = new object();
+        $a = new stdClass();
         $a->label  = $this->_label;
         $a->after  = userdate($after);
         $a->before = userdate($before);

diff --git a/user/filters/globalrole.php b/user/filters/globalrole.php
@@ -81,7 +81,7 @@ function get_label($data) {
 
         $rolename = $DB->get_field('role', 'name', array('id'=>$data['value']));
 
-        $a = new object();
+        $a = new stdClass();
         $a->label = $this->_label;
         $a->value = '"'.format_string($rolename).'"';
 

diff --git a/user/filters/profilefield.php b/user/filters/profilefield.php
@@ -188,7 +188,7 @@ function get_label($data) {
             return '';
         }
 
-        $a = new object();
+        $a = new stdClass();
         $a->label    = $this->_label;
         $a->value    = $value;
         $a->profile  = $profile_fields[$profile];

diff --git a/user/filters/select.php b/user/filters/select.php
@@ -120,7 +120,7 @@ function get_label($data) {
             return '';
         }
 
-        $a = new object();
+        $a = new stdClass();
         $a->label    = $this->_label;
         $a->value    = '"'.s($this->_options[$value]).'"';
         $a->operator = $operators[$operator];

diff --git a/user/filters/simpleselect.php b/user/filters/simpleselect.php
@@ -80,7 +80,7 @@ function get_sql_filter($data) {
     function get_label($data) {
         $value = $data['value'];
 
-        $a = new object();
+        $a = new stdClass();
         $a->label    = $this->_label;
         $a->value    = '"'.s($this->_options[$value]).'"';
         $a->operator = get_string('isequalto','filters');

diff --git a/user/filters/text.php b/user/filters/text.php
@@ -129,7 +129,7 @@ function get_label($data) {
         $value     = $data['value'];
         $operators = $this->getOperators();
 
-        $a = new object();
+        $a = new stdClass();
         $a->label    = $this->_label;
         $a->value    = '"'.s($value).'"';
         $a->operator = $operators[$operator];

diff --git a/user/groupaddnote.php b/user/groupaddnote.php
@@ -55,7 +55,7 @@
 }
 
 if (!empty($users) && !empty($content) && confirm_sesskey()) {
-    $note = new object();
+    $note = new stdClass();
     $note->courseid = $id;
     $note->format = FORMAT_PLAIN;
     $note->content = $content;

diff --git a/user/lib.php b/user/lib.php
@@ -120,7 +120,7 @@ function user_delete_user($user) {
     }
 
     // mark internal user record as "deleted"
-    $updateuser = new object();
+    $updateuser = new stdClass();
     $updateuser->id           = $user->id;
     $updateuser->deleted      = 1;
     $updateuser->username     = $delname;            // Remember it just in case

diff --git a/user/profile/definelib.php b/user/profile/definelib.php
@@ -198,7 +198,7 @@ function profile_reorder_fields() {
             $i = 1;
             if ($fields = $DB->get_records('user_info_field', array('categoryid'=>$category->id), 'sortorder ASC')) {
                 foreach ($fields as $field) {
-                    $f = new object();
+                    $f = new stdClass();
                     $f->id = $field->id;
                     $f->sortorder = $i++;
                     $DB->update_record('user_info_field', $f);
@@ -218,7 +218,7 @@ function profile_reorder_categories() {
     $i = 1;
     if ($categories = $DB->get_records('user_info_category', null, 'sortorder ASC')) {
         foreach ($categories as $cat) {
-            $c = new object();
+            $c = new stdClass();
             $c->id = $cat->id;
             $c->sortorder = $i++;
             $DB->update_record('user_info_category', $c);
@@ -263,7 +263,7 @@ function profile_delete_category($id) {
 
         if ($fields = $DB->get_records('user_info_field', array('categoryid'=>$category->id), 'sortorder ASC')) {
             foreach ($fields as $field) {
-                $f = new object();
+                $f = new stdClass();
                 $f->id = $field->id;
                 $f->sortorder = $sortorder++;
                 $f->categoryid = $newcategory->id;
@@ -453,7 +453,7 @@ function profile_edit_field($id, $datatype, $redirect) {
     global $CFG, $DB, $OUTPUT, $PAGE;
 
     if (!$field = $DB->get_record('user_info_field', array('id'=>$id))) {
-        $field = new object();
+        $field = new stdClass();
         $field->datatype = $datatype;
         $field->description = '';
         $field->descriptionformat = FORMAT_HTML;

diff --git a/user/profile/field/checkbox/field.class.php b/user/profile/field/checkbox/field.class.php
@@ -38,7 +38,7 @@ function edit_field_add(&$mform) {
      * Display the data for this field
      */
     function display_data() {
-        $options = new object();
+        $options = new stdClass();
         $options->para = false;
         $checked = intval($this->data) === 1 ? 'checked="checked"' : '';
         return '<input disabled="disabled" type="checkbox" name="'.$this->inputname.'" '.$checked.' />';

diff --git a/user/profile/index.php b/user/profile/index.php
@@ -89,7 +89,7 @@
 
 /// Check that we have at least one category defined
 if ($DB->count_records('user_info_category') == 0) {
-    $defaultcategory = new object();
+    $defaultcategory = new stdClass();
     $defaultcategory->name = $strdefaultcategory;
     $defaultcategory->sortorder = 1;
     $DB->insert_record('user_info_category', $defaultcategory);

diff --git a/user/profile/lib.php b/user/profile/lib.php
@@ -54,7 +54,7 @@ function edit_field_add(&$mform) {
      * Display the data for this field
      */
     function display_data() {
-        $options = new object();
+        $options = new stdClass();
         $options->para = false;
         return format_text($this->data, FORMAT_MOODLE, $options);
     }
@@ -105,7 +105,7 @@ function edit_save_data($usernew) {
             return;
         }
 
-        $data = new object();
+        $data = new stdClass();
 
         $usernew->{$this->inputname} = $this->edit_save_data_preprocess($usernew->{$this->inputname}, $data);
 
@@ -471,7 +471,7 @@ function profile_signup_fields(&$mform) {
 function profile_user_record($userid) {
     global $CFG, $DB;
 
-    $usercustomfields = new object();
+    $usercustomfields = new stdClass();
 
     if ($fields = $DB->get_records('user_info_field')) {
         foreach ($fields as $field) {