valvin
/
ttrss
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into jremote 

update working to master
This commit is contained in:
justauser 2013-05-28 11:39:58 -04:00
parent 2e937560df 1d76589693
commit 991418fa56
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
classes/pluginhost.php
View File

@ -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'

2
include/functions.php
View File

@ -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)) {

2
js/viewfeed.js
View File

@ -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);