L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-27341, fixed flickr public plugin should check

Browse Source 
search text, tag and nsid before searching photos
This commit is contained in:
Dongsheng Cai
2011-06-17 12:14:05 +08:00
parent c3f85e22d9
commit da78b10ce0
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
repository/flickr_public/lib.php
+13 -13
View File
@@ -280,19 +280,19 @@ class repository_flickr_public extends repository {
$licenses = implode(',', $licenses);
if (!empty($SESSION->{$this->sess_tag}) // use tag to search
or !empty($SESSION->{$this->sess_text}) // use keyword to search
or !empty($this->nsid)/*use pre-defined accound*/) {
$photos = $this->flickr->photos_search(array(
'tags'=>$SESSION->{$this->sess_tag},
'page'=>$page,
'per_page'=>24,
'user_id'=>$this->nsid,
'license'=>$licenses,
'text'=>$SESSION->{$this->sess_text}
)
);
}
$tag = !empty($SESSION->{$this->sess_tag}) ? $SESSION->{$this->sess_tag} : null;
$text = !empty($SESSION->{$this->sess_text}) ? $SESSION->{$this->sess_text} : null;
$nsid = !empty($this->nsid) ? $this->nsid : null;
$photos = $this->flickr->photos_search(array(
'tags'=>$tag,
'page'=>$page,
'per_page'=>24,
'user_id'=>$nsid,
'license'=>$licenses,
'text'=>$text
)
);
$ret['total'] = $photos['total'];
$ret['perpage'] = $photos['perpage'];
if (empty($photos)) {