Merge branch 'master' into jremote

update working to master

classes/pluginhost.php

@@ -274,7 +274,8 @@ class PluginHost {
 			if (!isset($this->storage[$plugin]))
 				$this->storage[$plugin] = array();
 
-			$content = $this->dbh->escape_string(serialize($this->storage[$plugin]));
+			$content = $this->dbh->escape_string(serialize($this->storage[$plugin]),
+				false);
 
 			if ($this->dbh->num_rows($result) != 0) {
 				$this->dbh->query("UPDATE ttrss_plugin_storage SET content = '$content'

include/functions.php

@@ -961,7 +961,7 @@
 	}
 
 	function file_is_locked($filename) {
-		if (function_exists('flock')) {
+		if (function_exists('flock') && file_exists(LOCK_DIRECTORY . "/$filename")) {
 			$fp = @fopen(LOCK_DIRECTORY . "/$filename", "r");
 			if ($fp) {
 				if (flock($fp, LOCK_EX | LOCK_NB)) {

js/viewfeed.js

@@ -590,7 +590,7 @@ function moveToPost(mode, noscroll, noexpand) {
 
 					if (!getInitParam("cdm_expanded")) {
 
-						if (!noscroll && article.offsetTop < ctr.scrollTop) {
+						if (!noscroll && article && article.offsetTop < ctr.scrollTop) {
 							scrollArticle(-ctr.offsetHeight/4);
 						} else {
 							cdmExpandArticle(prev_id, noexpand);