Merge remote-tracking branch 'mike/master' into dev

include/zid.php

@@ -70,9 +70,9 @@ function zid($s, $address = '') {
 		$zurl .= '#' . $fragment;
 
 	$arr = [
-			'url' => $s,
-			'zid' => urlencode($myaddr),
-			'result' => $zurl
+		'url' => $s,
+		'zid' => urlencode($myaddr),
+		'result' => $zurl
 	];
 	/**
 	 * @hooks zid

view/js/main.js

@@ -888,7 +888,7 @@ function liveUpdate(notify_id) {
 
 	if((src === null) || (stopped) || (! profile_uid)) { $('.like-rotator').hide(); return; }
 
-	if(($('.comment-edit-text.expanded').length) || (in_progress) || (mediaPlaying)) {
+	if(in_progress || mediaPlaying) {
 		if(livetime) {
 			clearTimeout(livetime);
 		}