Permalink
Browse files

Merged changes from stable.

Fixed typo.
Made constructor variables optional to reflect parent class
  • Loading branch information...
1 parent e0ac844 commit c3af90961c2bb5f9699ad26c46f80c1a5bcf3833 ikawhero committed Apr 19, 2007
Showing with 2 additions and 2 deletions.
  1. +2 −2 user/profile/field/menu/field.class.php
@@ -9,7 +9,7 @@ class profile_field_menu extends profile_field_base {
* Pulls out the options for the menu from the database and sets the
* the corresponding key for the data if it exists
*/
- function profile_field_menu($fieldid, $userid) {
+ function profile_field_menu($fieldid=0, $userid=0) {
//first call parent constructor
$this->profile_field_base($fieldid, $userid);
@@ -40,7 +40,7 @@ function edit_field_add(&$mform) {
* Overwrites the base class method
*/
function edit_field_set_default(&$mform) {
- $defaultkey = (int)array_search($field->defaultdata, $this->options);
+ $defaultkey = (int)array_search($this->field->defaultdata, $this->options);
$mform->setDefault($this->inputname, $defaultkey);
}

0 comments on commit c3af909

Please sign in to comment.