GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Fixing photo page replies and descriptions

Browse Source
This commit is contained in:
Max Shinn 2010-12-27 16:39:21 -06:00
parent 98cb4a4e54
commit a6bf28f3ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GNUsocialPhotos/actions/photo.php
View File

@ -50,7 +50,7 @@ class PhotoAction extends Action
$this->user = Profile::staticGet('id', $this->notice->profile_id); $this->user = Profile::staticGet('id', $this->notice->profile_id);
$notices = Notice::conversationStream((int)$this->photoid-1, null, null); //Why do I have to do -1? $notices = Notice::conversationStream((int)$this->notice->conversation, null, null); //Why do I have to do -1?
$this->conversation = new ConversationTree($notices, $this); $this->conversation = new ConversationTree($notices, $this);
return true; return true;

4
plugins/GNUsocialPhotos/classes/gnusocialphoto.php
View File

@ -75,7 +75,7 @@ class GNUsocialPhoto extends Memcached_DataObject
'uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, 'uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'thumb_uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, 'thumb_uri' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'title' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL, 'title' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL,
'photo_description' => DB_DATAOBJECT_TXT + DB_DATAOBJECT_NOTNULL); 'photo_description' => DB_DATAOBJECT_STR + DB_DATAOBJECT_NOTNULL);
} }
function keys() function keys()
@ -100,7 +100,7 @@ class GNUsocialPhoto extends Memcached_DataObject
$photo->uri = $uri; $photo->uri = $uri;
$photo->album_id = $album_id; $photo->album_id = $album_id;
if(!empty($title)) $photo->title = $title; if(!empty($title)) $photo->title = $title;
if(!empty($photo_description)) $photo->photo_description = $photo_description; if(!empty($photo_description)) $photo->photo_description = (string)$photo_description;
if($insert_now) { if($insert_now) {
$notice = Notice::saveNew($profile_id, $uri, $source); $notice = Notice::saveNew($profile_id, $uri, $source);