Permalink
Browse files

Merge branch 'MDL-34077-22' of git://github.com/FMCorz/moodle into MO…

…ODLE_22_STABLE
  • Loading branch information...
danpoltawski committed Jul 9, 2012
2 parents 751f5b0 + f544bb6 commit 98fb4b4f09f21c04d6f629bd34e65b63abfe45c0
Showing with 2 additions and 3 deletions.
  1. +2 −0 repository/flickr/lib.php
  2. +0 −3 repository/picasa/lib.php
@@ -278,6 +278,8 @@ public function type_config_form($mform) {
$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'));
@@ -117,9 +117,6 @@ public function logout(){
return parent::logout();
}
- public function get_name(){
- return get_string('pluginname', 'repository_picasa');
- }
public function supported_filetypes() {
return array('web_image');
}

0 comments on commit 98fb4b4

Please sign in to comment.