From 6944d67dbc2399abd7b65da07952b16c8178d3a5 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Fri, 13 May 2016 01:26:07 +0200
Subject: [PATCH 1/2] photos view: fix js error with undefined variable

---
 mod/photos.php                                   | 4 ++++
 view/templates/photo_view.tpl                    | 2 +-
 view/theme/frost-mobile/templates/photo_view.tpl | 2 +-
 view/theme/frost/templates/photo_view.tpl        | 2 +-
 view/theme/quattro/templates/photo_view.tpl      | 2 +-
 view/theme/vier/templates/photo_view.tpl         | 2 +-
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 4761b627d8..7d4e2de59c 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1079,6 +1079,10 @@ function photos_content(&$a) {
 
 	$o = "";
 
+	// js variables for liveUpdate function in main.js
+	$o .= "<script> var profile_uid = " . $a->profile_uid 
+			. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
+
 	// tabs
 	$is_owner = (local_user() && (local_user() == $owner_uid));
 	$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);
diff --git a/view/templates/photo_view.tpl b/view/templates/photo_view.tpl
index 847b623ebe..b85a1c2f53 100644
--- a/view/templates/photo_view.tpl
+++ b/view/templates/photo_view.tpl
@@ -1,5 +1,5 @@
 
-<div id="live-display"></div>
+<div id="live-photos"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 <div id="photo-edit-link-wrap">
diff --git a/view/theme/frost-mobile/templates/photo_view.tpl b/view/theme/frost-mobile/templates/photo_view.tpl
index 8d92b7ba79..a5fb2f0415 100644
--- a/view/theme/frost-mobile/templates/photo_view.tpl
+++ b/view/theme/frost-mobile/templates/photo_view.tpl
@@ -1,5 +1,5 @@
 
-<div id="live-display"></div>
+<div id="live-photos"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 <div id="photo-edit-link-wrap">
diff --git a/view/theme/frost/templates/photo_view.tpl b/view/theme/frost/templates/photo_view.tpl
index 8d92b7ba79..a5fb2f0415 100644
--- a/view/theme/frost/templates/photo_view.tpl
+++ b/view/theme/frost/templates/photo_view.tpl
@@ -1,5 +1,5 @@
 
-<div id="live-display"></div>
+<div id="live-photos"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 <div id="photo-edit-link-wrap">
diff --git a/view/theme/quattro/templates/photo_view.tpl b/view/theme/quattro/templates/photo_view.tpl
index 463969e78e..f4a780a0ac 100644
--- a/view/theme/quattro/templates/photo_view.tpl
+++ b/view/theme/quattro/templates/photo_view.tpl
@@ -1,4 +1,4 @@
-<div id="live-display"></div>
+<div id="live-photos"></div>
 <h3 id="photo-album-title"><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 <div id="photo-edit-link-wrap">
diff --git a/view/theme/vier/templates/photo_view.tpl b/view/theme/vier/templates/photo_view.tpl
index fcf0cc36d1..c252960c08 100644
--- a/view/theme/vier/templates/photo_view.tpl
+++ b/view/theme/vier/templates/photo_view.tpl
@@ -1,5 +1,5 @@
 
-<div id="live-display"></div>
+<div id="live-photos"></div>
 <h3><a href="{{$album.0}}">{{$album.1}}</a></h3>
 
 <div id="photo-edit-link-wrap">

From 255405c8f3f77f0d1892db38db2ae14f518d16e1 Mon Sep 17 00:00:00 2001
From: rabuzarus <>
Date: Fri, 13 May 2016 01:34:56 +0200
Subject: [PATCH 2/2] photos view: fix js error - forgot to delete this testing
 stuff

---
 mod/photos.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mod/photos.php b/mod/photos.php
index 7d4e2de59c..4761b627d8 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -1079,10 +1079,6 @@ function photos_content(&$a) {
 
 	$o = "";
 
-	// js variables for liveUpdate function in main.js
-	$o .= "<script> var profile_uid = " . $a->profile_uid 
-			. "; var netargs = '?f='; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
-
 	// tabs
 	$is_owner = (local_user() && (local_user() == $owner_uid));
 	$o .= profile_tabs($a,$is_owner, $a->data['user']['nickname']);