Merge branch 'wip-MDL-32171-master' of git://github.com/marinaglancy/moodle

This commit is contained in:
Aparup Banerjee 2012-04-03 11:42:58 +08:00
commit bc706271c8
2 changed files with 3 additions and 0 deletions

View File

@ -376,6 +376,7 @@ class google_picasa {
const ALBUM_PHOTO_LIST = 'https://picasaweb.google.com/data/feed/api/user/default/albumid/';
const PHOTO_SEARCH_URL = 'https://picasaweb.google.com/data/feed/api/user/default?kind=photo&q=';
const LIST_ALBUMS_URL = 'https://picasaweb.google.com/data/feed/api/user/default';
const MANAGE_URL = 'http://picasaweb.google.com/';
private $google_curl = null;

View File

@ -84,6 +84,7 @@ class repository_picasa extends repository {
$ret = array();
$ret['dynload'] = true;
$ret['manage'] = google_picasa::MANAGE_URL;
$ret['list'] = $picasa->get_file_list($path);
return $ret;
}
@ -92,6 +93,7 @@ class repository_picasa extends repository {
$picasa = new google_picasa(new google_authsub($this->subauthtoken));
$ret = array();
$ret['manage'] = google_picasa::MANAGE_URL;
$ret['list'] = $picasa->do_photo_search($search_text);
return $ret;
}