Merge branch 'MDL-60615-32' of git://github.com/damyon/moodle into MO…

…ODLE_32_STABLE

backup/cc/entity.forum.class.php

@@ -112,7 +112,7 @@ private function create_node_course_modules_mod_forum ($instance) {

    public function get_topic_data ($instance) {

        $topic_data = '';
        $topic_data = array();

        $topic_file = $this->get_external_xml($instance['resource_indentifier']);

backup/cc/entity.quiz.class.php

@@ -68,7 +68,7 @@ private function generate_instances () {
        $last_question_id = 0;
        $last_answer_id = 0;

        $instances = '';
        $instances = array();

        $types = array(MOODLE_TYPE_QUIZ, MOODLE_TYPE_QUESTION_BANK);

backup/cc/entity11.basiclti.class.php

@@ -87,7 +87,7 @@ protected function getValue($node, $default = '') {

    public function get_basiclti_data($instance) {

        $topic_data = '';
        $topic_data = array();

        $basiclti_file = $this->get_external_xml($instance['resource_indentifier']);

backup/cc/entity11.forum.class.php

@@ -111,7 +111,7 @@ private function create_node_course_modules_mod_forum ($instance) {

    public function get_topic_data ($instance) {

        $topic_data = '';
        $topic_data = array();

        $topic_file = $this->get_external_xml($instance['resource_indentifier']);

backup/cc/entity11.lti.class.php

@@ -82,7 +82,7 @@ protected function getValue($node, $default = '') {

    public function get_basiclti_data($instance) {

        $topic_data = '';
        $topic_data = array();

        $basiclti_file = $this->get_external_xml($instance['resource_indentifier']);

backup/cc/entity11.quiz.class.php

@@ -68,7 +68,7 @@ private function generate_instances () {
        $last_question_id = 0;
        $last_answer_id = 0;

        $instances = '';
        $instances = array();

        $types = array(MOODLE_TYPE_QUIZ, MOODLE_TYPE_QUESTION_BANK);