Merge branch 'MDL-34077-master' of git://github.com/FMCorz/moodle

This commit is contained in:
Dan Poltawski 2012-07-09 13:37:20 +08:00
commit 098c02be10
2 changed files with 2 additions and 3 deletions

View File

@ -278,6 +278,8 @@ class repository_flickr extends repository {
$secret = '';
}
parent::type_config_form($mform);
$strrequired = get_string('required');
$mform->addElement('text', 'api_key', get_string('apikey', 'repository_flickr'), array('value'=>$api_key,'size' => '40'));
$mform->addElement('text', 'secret', get_string('secret', 'repository_flickr'), array('value'=>$secret,'size' => '40'));

View File

@ -98,9 +98,6 @@ class repository_picasa extends repository {
return parent::logout();
}
public function get_name() {
return get_string('pluginname', 'repository_picasa');
}
public function supported_filetypes() {
return array('web_image');
}