From 3100b5d93e9f440a17b99d2856ee022b29d73f80 Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 27 Jan 2014 18:06:09 -0800
Subject: photo tagging still broken - but at least don't create a new linked
 item every time a photo is edited.

---
 library/ajaxchat/chat/lib/class/CustomAJAXChat.php | 2 ++
 mod/photos.php                                     | 4 ++++
 view/tpl/photo_view.tpl                            | 2 +-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/library/ajaxchat/chat/lib/class/CustomAJAXChat.php b/library/ajaxchat/chat/lib/class/CustomAJAXChat.php
index a18e64069..9fff6ada9 100644
--- a/library/ajaxchat/chat/lib/class/CustomAJAXChat.php
+++ b/library/ajaxchat/chat/lib/class/CustomAJAXChat.php
@@ -13,6 +13,8 @@ class CustomAJAXChat extends AJAXChat {
 	// Returns null if login is invalid
 	function getValidLoginUserData() {
 		
+
+
 		$customUsers = $this->getCustomUsers();
 		
 		if($this->getRequestVar('password')) {
diff --git a/mod/photos.php b/mod/photos.php
index 23733e121..c299fe778 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -778,6 +778,8 @@ function photos_content(&$a) {
 			return;
 		}
 
+
+
 		$prevlink = '';
 		$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 
 
 		$r = $r[0]['children'];
diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl
index e56fd5b57..93e9abfa5 100755
--- a/view/tpl/photo_view.tpl
+++ b/view/tpl/photo_view.tpl
@@ -24,7 +24,7 @@
 <div id="photo-edit-edit" style="display: none;">
 <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>
 	<input id="photo-edit-albumname" type="text" size="32" name="albname" value="{{$edit.album}}" />
-- 
cgit v1.2.3