Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / GNUsocialPhotos / actions / photos.php

diff --git a/plugins/GNUsocialPhotos/actions/photos.php b/plugins/GNUsocialPhotos/actions/photos.php
index 07b0472480c30d5a540ef9caac03252af169fa33..a180be8c12098295c3724287184dc8d5c218681a 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/photos.php
+++ b/plugins/GNUsocialPhotos/actions/photos.php
@@ -38,7 +38,7 @@ class PhotosAction extends Action
 {
     var $user = null;
 
-    function prepare($args)
+    function prepare(array $args=array())
     {
         parent::prepare($args);
 
@@ -48,12 +48,12 @@ class PhotosAction extends Action
         if (common_valid_profile_tag($username) == 0) {
             $this->user = null;
         } else {
-            $this->user = Profile::staticGet('nickname', $username);
+            $this->user = Profile::getKV('nickname', $username);
         }
         return true;
     }
 
-    function handle($args)
+    function handle(array $args=array())
     {
         parent::handle($args);
         $this->showPage();
@@ -82,17 +82,16 @@ class PhotosAction extends Action
         $this->element('option', array('value' => '120'), _("Medium"));
         $this->element('option', array('value' => '400'), _("Normal"));
         $this->elementEnd('select');
-    }        
+    }
 
     function showAlbums()
     {
         $album = new GNUsocialPhotoAlbum();
-        $album->user_id = $this->user->id;
+        $album->profile_id = $this->user->id;
 
         $albums = array();
         if (!$album->find()) {
-            $cur = common_current_user();
-            GNUsocialPhotoAlbum::newAlbum($cur->profile_id, 'Default');
+            GNUsocialPhotoAlbum::newAlbum($this->user->id, 'Default');
         }
 
         $this->elementStart('div', array('class' => 'galleryheader'));
@@ -121,7 +120,7 @@ class PhotosAction extends Action
     
     function showAlbum($album_id)
     {
-        $album = GNUSocialPhotoAlbum::staticGet('album_id', $album_id);
+        $album = GNUsocialPhotoAlbum::getKV('album_id', $album_id);
         if (!$album) {
             return;
         }