"MDL-13766, add original format for flickr"

diff --git a/repository/flickr/repository.class.php b/repository/flickr/repository.class.php
index 7bf2e699fc27b05b6d81430f27b6a7f2d55106da..84c59654ce8c3f8a762782048a523c50e3287a8d 100755 (executable)
--- a/repository/flickr/repository.class.php
+++ b/repository/flickr/repository.class.php
@@ -110,7 +110,7 @@ EOD;
             // do searching, if $path is not empty, ignore it.
             $photos = $this->flickr->photos_search(array('user_id'=>$people['nsid'], 'text'=>$search));
         } elseif(!empty($path) && empty($search)) {
-            $photos = $this->flickr->people_getPublicPhotos($people['nsid'], null, 36, $path);
+            $photos = $this->flickr->people_getPublicPhotos($people['nsid'], 'original_format', 36, $path);
         }
 
         $ret = new stdclass;
@@ -126,8 +126,13 @@ EOD;
             if(empty($p['title'])) {
                 $p['title'] = get_string('notitle', 'repository_flickr');
             }
+            if (isset($p['originalformat'])) {
+                $format = $p['originalformat'];
+            } else {
+                $format = 'jpg';
+            }
             $ret->list[] =
-                array('title'=>$p['title'],'source'=>$p['id'],'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'), 'date'=>'', 'size'=>'unknown');
+                array('title'=>$p['title'].'.'.$format,'source'=>$p['id'],'id'=>$p['id'],'thumbnail'=>$this->flickr->buildPhotoURL($p, 'Square'), 'date'=>'', 'size'=>'unknown');
         }
         if(empty($ret)) {
             throw new repository_exception('nullphotolist', 'repository_flickr');