Merge branch 's10_MDL-27341_flickr_plugin_master' of git://github.com/dongsheng/moodle

diff --git a/admin/repositoryinstance.php b/admin/repositoryinstance.php
index 640ebc9..d034f18 100644 (file)
--- a/admin/repositoryinstance.php
+++ b/admin/repositoryinstance.php
@@ -66,9 +66,14 @@ if (!empty($edit) || !empty($new)) {
         if ($edit) {
             $settings = array();
             $settings['name'] = $fromform->name;
+            var_dump($fromform);
             if (!$instance->readonly) {
                 foreach($configs as $config) {
-                    $settings[$config] = $fromform->$config;
+                    if (isset($fromform->$config)) {
+                        $settings[$config] = $fromform->$config;
+                    } else {
+                        $settings[$config] = null;
+                    }
                 }
             }
             $success = $instance->set_option($settings);

diff --git a/repository/flickr_public/lib.php b/repository/flickr_public/lib.php
index 62a2907..1cfb42f 100644 (file)
--- a/repository/flickr_public/lib.php
+++ b/repository/flickr_public/lib.php
@@ -456,7 +456,7 @@ class repository_flickr_public extends repository {
     public function instance_config_form($mform) {
         $mform->addElement('text', 'email_address', get_string('emailaddress', 'repository_flickr_public'));
         $mform->addElement('checkbox', 'usewatermarks', get_string('watermark', 'repository_flickr_public'));
-        //$mform->addRule('email_address', get_string('required'), 'required', null, 'client');
+        $mform->setDefault('usewatermarks', 0);
     }
 
     /**
@@ -498,7 +498,7 @@ class repository_flickr_public extends repository {
     public static function plugin_init() {
         //here we create a default instance for this type
 
-        $id = repository::static_function('flickr_public','create', 'flickr_public', 0, get_system_context(), array('name'=>'', 'email_address' => null), 0);
+        $id = repository::static_function('flickr_public','create', 'flickr_public', 0, get_system_context(), array('name'=>'', 'email_address' => null, 'usewatermarks' => false), 0);
         if (empty($id)) {
             return false;
         } else {