"MDL-13766, repository api, fixed typeid value"

diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php
index b6fa19320e764b646461a0225492ee6d5061d4ae..df2e48e6629556e07273e2bddfeda00b2a899ed6 100644 (file)
--- a/admin/repositoryinstance.php
+++ b/admin/repositoryinstance.php
@@ -43,11 +43,11 @@ $return = true;
 if (!empty($edit) || !empty($new)) {
     if (!empty($edit)) {
         $instance = repository::get_instance($edit);
-        $instancetype = repository::get_type_by_id($instance->typeid);
+        $instancetype = repository::get_type_by_id($instance->options['typeid']);
         $classname = 'repository_' . $instancetype->get_typename();
         $configs  = $instance->get_instance_option_names();
         $plugin = $instancetype->get_typename();
-        $typeid = $instance->typeid;
+        $typeid = $instance->options['typeid'];
     } else {
         $plugin = $new;
         $typeid = $new;

diff --git a/repository/filesystem/repository.class.php b/repository/filesystem/repository.class.php
index e5c2342bf14c60e88c731aaeaead2277e54c42ad..865066d92f3dfe0b91dcfd5142bd38e6115bc4ff 100644 (file)
--- a/repository/filesystem/repository.class.php
+++ b/repository/filesystem/repository.class.php
@@ -9,10 +9,10 @@ class repository_filesystem extends repository {
         );
     public function __construct($repositoryid, $context = SITEID, $options = array()) {
         parent::__construct($repositoryid, $context, $options);
-        if (empty($this->root_path)) {
+        if (empty($this->options['root_path'])) {
             return;
         }
-        $this->root_path = trim($this->root_path);
+        $this->root_path = trim($this->options['root_path']);
         if (!empty($options['ajax'])) {
             // if created from filepicker
             if (empty($this->root_path)) {

diff --git a/repository/lib.php b/repository/lib.php
index 5f77f9aee5339676e2cfe6664635d8890a2585b5..09e0792e4f86d3735cfd14496fed305db55e7eac 100644 (file)
--- a/repository/lib.php
+++ b/repository/lib.php
@@ -1020,7 +1020,7 @@ abstract class repository {
                 $delete .= '<a href="' . $baseurl . '&amp;type='.$typename.'&amp;delete=' .  $i->id . '">' . $deletestr . '</a>' . "\n";
             }
 
-            $type = repository::get_type_by_id($i->typeid);
+            $type = repository::get_type_by_id($i->options['typeid']);
             $table->data[] = array($i->name, $type->get_readablename(), $delete, $settings);
 
             //display a grey row if the type is defined as not visible
@@ -1612,8 +1612,8 @@ final class repository_instance_form extends moodleform {
                 $result = $this->instance->instance_config_form($mform);
                 // and set the data if we have some.
                 foreach ($this->instance->get_instance_option_names() as $config) {
-                    if (!empty($this->instance->$config)) {
-                        $data[$config] = $this->instance->$config;
+                    if (!empty($this->instance->options[$config])) {
+                        $data[$config] = $this->instance->options[$config];
                      } else {
                         $data[$config] = '';
                      }