Merge branch 'MDL-26537-flickr-callback-url' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 15:23:08 +0000 (16:23 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 22 Feb 2011 15:23:08 +0000 (16:23 +0100)
portfolio/flickr/lib.php

index 4c64fa7..fe63d9d 100755 (executable)
@@ -107,7 +107,7 @@ class portfolio_plugin_flickr extends portfolio_plugin_push_base {
         $a = new stdClass();
         $a->applyurl = 'http://www.flickr.com/services/api/keys/apply/';
         $a->keysurl = 'http://www.flickr.com/services/api/keys/';
-        $a->callbackurl = $CFG->wwwroot . '/portfolio/add.php?postcontrol=1&type=boxnet';
+        $a->callbackurl = $CFG->wwwroot . '/portfolio/add.php?postcontrol=1&type=flickr';
         $mform->addElement('static', 'setupinfo', get_string('setupinfo', 'portfolio_flickr'),
             get_string('setupinfodetails', 'portfolio_flickr', $a));
     }