Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'MDL-34725-strict-standards_23' of git://github.com/mudr…
…d8mz/moodle into MOODLE_23_STABLE
  • Loading branch information
stronk7 committed Sep 3, 2012
2 parents 0af2fd2 + 160133c commit 99e6bd4
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
7 changes: 6 additions & 1 deletion mod/workshop/form/comments/backup/moodle1/lib.php
Expand Up @@ -32,8 +32,13 @@ class moodle1_workshopform_comments_handler extends moodle1_workshopform_handler

/**
* Converts <ELEMENT> into <workshopform_comments_dimension>
*
* @param array $data legacy element data
* @param array $raw raw element data
*
* @return array converted
*/
public function process_legacy_element($data, $raw) {
public function process_legacy_element(array $data, array $raw) {
// prepare a fake record and re-use the upgrade logic
$fakerecord = (object)$data;
$converted = (array)workshopform_comments_upgrade_element($fakerecord, 12345678);
Expand Down
5 changes: 4 additions & 1 deletion mod/workshop/form/numerrors/backup/moodle1/lib.php
Expand Up @@ -49,9 +49,12 @@ public function on_elements_start() {
/**
* Converts <ELEMENT> into <workshopform_numerrors_dimension> and stores it for later writing
*
* @param array $data legacy element data
* @param array $raw raw element data
*
* @return array to be written to workshop.xml
*/
public function process_legacy_element($data, $raw) {
public function process_legacy_element(array $data, array $raw) {

$workshop = $this->parenthandler->get_current_workshop();

Expand Down
5 changes: 4 additions & 1 deletion mod/workshop/form/rubric/backup/moodle1/lib.php
Expand Up @@ -46,8 +46,11 @@ public function on_elements_start() {

/**
* Processes one <ELEMENT>
*
* @param array $data legacy element data
* @param array $raw raw element data
*/
public function process_legacy_element($data, $raw) {
public function process_legacy_element(array $data, array $raw) {
$this->elements[] = $data;
$this->rubrics[$data['id']] = array();
}
Expand Down

0 comments on commit 99e6bd4

Please sign in to comment.