Skip to content

Commit

Permalink
MDL-45469 profile: make sure profile fields can be initialised withou…
Browse files Browse the repository at this point in the history
…t arguments
  • Loading branch information
marinaglancy committed May 21, 2014
1 parent 7d5774a commit f01e473
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 2 deletions.
8 changes: 6 additions & 2 deletions user/profile/field/menu/field.class.php
Expand Up @@ -14,9 +14,13 @@ function profile_field_menu($fieldid=0, $userid=0) {
$this->profile_field_base($fieldid, $userid);

/// Param 1 for menu type is the options
$options = explode("\n", $this->field->param1);
if (isset($this->field->param1)) {
$options = explode("\n", $this->field->param1);
} else {
$options = array();
}
$this->options = array();
if ($this->field->required){
if (!empty($this->field->required)) {
$this->options[''] = get_string('choose').'...';
}
foreach($options as $key => $option) {
Expand Down
53 changes: 53 additions & 0 deletions user/tests/profilelib_test.php
@@ -0,0 +1,53 @@
<?php
// This file is part of Moodle - http://moodle.org/
//
// Moodle is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// Moodle is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with Moodle. If not, see <http://www.gnu.org/licenses/>.

/**
* Unit tests for user/profile/lib.php.
*
* @package core_user
* @copyright 2014 The Open University
* @licensehttp://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/

defined('MOODLE_INTERNAL') || die();

global $CFG;

/**
* Unit tests for user/profile/lib.php.
*
* @package core_user
* @copyright 2014 The Open University
* @licensehttp://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_user_profilelib_testcase extends advanced_testcase {
/**
* Make sure that all profile fields can be initialised without arguments.
*/
public function test_default_constructor() {
global $DB, $CFG;
require_once($CFG->dirroot . '/user/profile/lib.php');
require_once($CFG->dirroot . '/user/profile/definelib.php');
$datatypes = profile_list_datatypes();
foreach ($datatypes as $datatype => $datatypename) {
require_once($CFG->dirroot . '/user/profile/field/' .
$datatype . '/field.class.php');
$newfield = 'profile_field_' . $datatype;
$formfield = new $newfield();
$this->assertNotNull($formfield);
}
}
}

0 comments on commit f01e473

Please sign in to comment.