Merge branch 'nightly' into singpolyma/gnu-social-events-saveObjectFromActivity

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

diff --git a/plugins/GNUsocialPhotos/actions/editphoto.php b/plugins/GNUsocialPhotos/actions/editphoto.php
index e32b5fe01d7e3d63e25c9d9002f8f50eea346af5..35dac7bf3f6298d921d62f100ffdd8b7d6059e5b 100644 (file)
--- a/plugins/GNUsocialPhotos/actions/editphoto.php
+++ b/plugins/GNUsocialPhotos/actions/editphoto.php
@@ -42,7 +42,7 @@ class EditphotoAction extends Action
         $args = $this->returnToArgs();
         $this->user = common_current_user();
         $this->photoid = $args[1]['photoid'];
-        $this->photo = GNUsocialPhoto::staticGet('id', $this->photoid);
+        $this->photo = GNUsocialPhoto::getKV('id', $this->photoid);
         return true;
     }
 
@@ -76,6 +76,12 @@ class EditphotoAction extends Action
             return;
         } 
 
+        //showForm() data
+        if(!empty($this->msg)) {
+            $class = ($this->success) ? 'success' : 'error';
+            $this->element('p', array('class' => $class), $this->msg);
+        }
+
         $this->element('img', array('src' => $this->photo->uri));
         $this->elementStart('form', array('method' => 'post',
                                           'action' => '/editphoto/' . $this->photo->id));
@@ -160,7 +166,7 @@ class EditphotoAction extends Action
 
         $profile_id = $cur->id;
        
-        $album = GNUsocialPhotoAlbum::staticGet('album_id', $this->trimmed('album'));
+        $album = GNUsocialPhotoAlbum::getKV('album_id', $this->trimmed('album'));
         if ($album->profile_id != $profile_id) {
             $this->showForm(_('Error: This is not your album!'));
             return;
@@ -173,8 +179,7 @@ class EditphotoAction extends Action
             return;
         }
         common_redirect('/photo/' . $this->photo->id, '303');
-        $this->showForm(_('Success!'));
-
+        // common_redirect exits
     }
 
     function deletePhoto()
@@ -182,17 +187,16 @@ class EditphotoAction extends Action
         //For redirection
         $oldalbum = $this->album_id;
 
-        $notice = Notice::staticGet('id', $this->photo->notice_id);
+        $notice = Notice::getKV('id', $this->photo->notice_id);
 
         $this->photo->delete();
         
         if (Event::handle('StartDeleteOwnNotice', array($this->user, $notice))) {
-            $notice->delete();
+            $notice->deleteAs($this->scoped);
             Event::handle('EndDeleteOwnNotice', array($this->user, $notice));
         }
        $this->showForm(_('Success!'));
         common_redirect('/' . $this->user->nickname . '/photos/' . $oldalbum, '303');
-        return;
     }
 
 }