harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

photo tagging still broken - but at least don't create a new linked item every time a photo is edited.

Browse Source
This commit is contained in:
friendica 2014-01-27 18:06:09 -08:00
parent d9794b981d
commit 3100b5d93e
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/ajaxchat/chat/lib/class/CustomAJAXChat.php
View File

@ -13,6 +13,8 @@ class CustomAJAXChat extends AJAXChat {
// Returns null if login is invalid // Returns null if login is invalid
function getValidLoginUserData() { function getValidLoginUserData() {
$customUsers = $this->getCustomUsers(); $customUsers = $this->getCustomUsers();
if($this->getRequestVar('password')) { if($this->getRequestVar('password')) {

4
mod/photos.php
View File

@ -778,6 +778,8 @@ function photos_content(&$a) {
return; return;
} }
$prevlink = ''; $prevlink = '';
$nextlink = ''; $nextlink = '';
@ -898,6 +900,8 @@ function photos_content(&$a) {
} }
} }
// logger('mod_photo: link_item' . print_r($link_item,true));
// FIXME - remove this when we move to conversation module // FIXME - remove this when we move to conversation module
$r = $r[0]['children']; $r = $r[0]['children'];

2
view/tpl/photo_view.tpl
View File

@ -24,7 +24,7 @@
<div id="photo-edit-edit" style="display: none;"> <div id="photo-edit-edit" style="display: none;">
<form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" > <form action="photos/{{$edit.nickname}}/{{$edit.resource_id}}" method="post" id="photo_edit_form" >
<input type="hidden" name="item_id" value="{{$item_id}}" /> <input type="hidden" name="item_id" value="{{$edit.item_id}}" />
<label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label> <label id="photo-edit-albumname-label" for="photo-edit-albumname">{{$edit.newalbum}}</label>
<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" /> <input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" />