Merge branch 'MDL-54546-master' of git://github.com/junpataleta/moodle

NoelDeMartin · May 13, 2016 · 6967b71 · 6967b71
2 parents 7fdd862 + e533656
commit 6967b71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/admin/tool/lp/classes/external/course_summary_exporter.php b/admin/tool/lp/classes/external/course_summary_exporter.php
@@ -58,7 +58,7 @@ public static function define_properties() {
                 'type' => PARAM_TEXT,
             ),
             'idnumber' => array(
-                'type' => PARAM_TEXT,
+                'type' => PARAM_RAW,
             )
         );
     }

diff --git a/competency/classes/external/user_summary_exporter.php b/competency/classes/external/user_summary_exporter.php
@@ -69,30 +69,30 @@ protected function get_other_values(renderer_base $output) {
     public static function define_properties() {
         return array(
             'id' => array(
-                'type' => PARAM_INT,
+                'type' => \core_user::get_property_type('id'),
             ),
             'email' => array(
-                'type' => PARAM_TEXT,
+                'type' => \core_user::get_property_type('email'),
                 'default' => ''
             ),
             'idnumber' => array(
-                'type' => PARAM_NOTAGS,
+                'type' => \core_user::get_property_type('idnumber'),
                 'default' => ''
             ),
             'phone1' => array(
-                'type' => PARAM_NOTAGS,
+                'type' => \core_user::get_property_type('phone1'),
                 'default' => ''
             ),
             'phone2' => array(
-                'type' => PARAM_NOTAGS,
+                'type' => \core_user::get_property_type('phone2'),
                 'default' => ''
             ),
             'department' => array(
-                'type' => PARAM_TEXT,
+                'type' => \core_user::get_property_type('department'),
                 'default' => ''
             ),
             'institution' => array(
-                'type' => PARAM_TEXT,
+                'type' => \core_user::get_property_type('institution'),
                 'default' => ''
             )
         );
@@ -101,10 +101,10 @@ public static function define_properties() {
     public static function define_other_properties() {
         return array(
             'fullname' => array(
-                'type' => PARAM_TEXT
+                'type' => PARAM_RAW
             ),
             'identity' => array(
-                'type' => PARAM_TEXT
+                'type' => PARAM_RAW
             ),
             'profileurl' => array(
                 'type' => PARAM_URL