Merge branch 'master' into tres

Conflicts:
	include/Contact.php
	include/ItemObject.php
	include/api.php
	include/attach.php
	include/diaspora.php
	include/dir_fns.php
	include/enotify.php
	include/event.php
	include/expire.php
	include/items.php
	include/notifier.php
	include/notify.php
	include/photos.php
	include/taxonomy.php
	include/text.php
	include/widgets.php
	include/zot.php
	mod/admin.php
	mod/channel.php
	mod/dirsearch.php
	mod/display.php
	mod/editwebpage.php
	mod/events.php
	mod/home.php
	mod/item.php
	mod/manage.php
	mod/mood.php
	mod/network.php
	mod/page.php
	mod/photos.php
	mod/ping.php
	mod/post.php
	mod/thing.php
	mod/viewsrc.php
	view/css/mod_events.css

1 files changed, 9 insertions, 6 deletions

diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 0526fd1e6..b254370c1 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -1,12 +1,16 @@
+/**
+ * JavaScript used by mod/photos
+ */
 
-var ispublic = aStr['everybody'];
+// is this variable used anywhere?
+var ispublic = aStr.everybody;
 
 $(document).ready(function() {
-	$(document).ready(function() { 
+	$(document).ready(function() {
 		$("#photo-edit-newtag").contact_autocomplete(baseurl + '/acl', 'p', false, function(data) {
 			$("#photo-edit-newtag").val('@' + data.name);
 		});
-	}); 
+	});
 
 	$('#contact_allow, #contact_deny, #group_allow, #group_deny').change(function() {
 		var selstr;
@@ -15,10 +19,9 @@ $(document).ready(function() {
 			$('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
 			$('#jot-public').hide();
 		});
-		if(selstr == null) { 
+		if(selstr === null) {
 			$('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
 			$('#jot-public').show();
 		}
-
 	}).trigger('change');
-});
+});
\ No newline at end of file