L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-26677 flickr repo - fix undefined index usewatermarks

Browse Source
This commit is contained in:
Dongsheng Cai
2011-06-23 17:13:46 +08:00
parent 3552484b91
commit 14b2d8d865
3 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/repositoryinstance.php
+5 -1
View File
@@ -68,7 +68,11 @@ if (!empty($edit) || !empty($new)) {
$settings['name'] = $fromform->name;
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);
repository/flickr_public/lib.php
+2 -2
View File
@@ -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 {
repository/lib.php
+5 -1
View File
@@ -1381,7 +1381,11 @@ abstract class repository {
$configs = call_user_func($classname . '::get_instance_option_names');
if (!empty($configs)) {
foreach ($configs as $config) {
$options[$config] = $params[$config];
if (isset($params[$config])) {
$options[$config] = $params[$config];
} else {
$options[$config] = null;
}
}
}