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

Merge branch 'MDL-77255-403' of https://github.com/HuongNV13/moodle into MOODLE_403_STABLE

Browse Source
This commit is contained in:
Andrew Nicols
2024-03-19 11:39:21 +08:00
parent 28f91d0b2d 02300131b7
commit a42516478d
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/tag_flickr/block_tag_flickr.php
+12 -10
View File
@@ -101,13 +101,14 @@ class block_tag_flickr extends block_base {
$request .= '&api_key='.FLICKR_DEV_KEY;
$request .= '&photoset_id='.$this->config->photoset;
$request .= '&per_page='.$numberofphotos;
$request .= '&format=php_serial';
$request .= '&format=json';
// We need to add nojsoncallback=? here, otherwise, Flickr will return the jsonFlickrApi object.
$request .= '&nojsoncallback=?';
$response = $this->fetch_request($request);
$search = @unserialize($response);
if ($search === false && $search != serialize(false)) {
// The response didn't appear to be anything serialized, exit...
$search = @json_decode($response, true);
if (!is_array($search) || json_last_error() !== JSON_ERROR_NONE) {
// The response didn't appear to be in correct format.
return;
}
@@ -126,13 +127,14 @@ class block_tag_flickr extends block_base {
$request .= '&tags='.$tagscsv;
$request .= '&per_page='.$numberofphotos;
$request .= '&sort='.$sortby;
$request .= '&format=php_serial';
$request .= '&format=json';
// We need to add nojsoncallback=? here, otherwise, Flickr will return the jsonFlickrApi object.
$request .= '&nojsoncallback=?';
$response = $this->fetch_request($request);
$search = @unserialize($response);
if ($search === false && $search != serialize(false)) {
// The response didn't appear to be anything serialized, exit...
$search = @json_decode($response, true);
if (!is_array($search) || json_last_error() !== JSON_ERROR_NONE) {
// The response didn't appear to be in correct format.
return;
}
$photos = array_values($search['photos']['photo']);