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

Andmat7 · Jul 9, 2012 · 098c02b · 098c02b
2 parents 357f4d8 + 545ca38
commit 098c02b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/repository/flickr/lib.php b/repository/flickr/lib.php
@@ -278,6 +278,8 @@ public static function type_config_form($mform, $classname = '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'));

diff --git a/repository/picasa/lib.php b/repository/picasa/lib.php
@@ -98,9 +98,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');
     }