aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-26 14:51:29 -0800
committerfriendica <info@friendica.com>2014-02-26 14:51:29 -0800
commitc8f1bf89a9c1a73c7b631ae59a9e0a17d7f9befd (patch)
treef09f8067a7af8be3711b15f56b48542167956186
parent364fc9f1638e67dad2c289b4d365753a5d06ac05 (diff)
downloadvolse-hubzilla-c8f1bf89a9c1a73c7b631ae59a9e0a17d7f9befd.tar.gz
volse-hubzilla-c8f1bf89a9c1a73c7b631ae59a9e0a17d7f9befd.tar.bz2
volse-hubzilla-c8f1bf89a9c1a73c7b631ae59a9e0a17d7f9befd.zip
vsprintf error
-rw-r--r--include/socgraph.php3
-rw-r--r--version.inc2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/socgraph.php b/include/socgraph.php
index 2bd0290cc..10d52da66 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -68,7 +68,8 @@ function poco_load($xchan = '',$url = null) {
if(array_key_exists('chatrooms',$j) && is_array($j['chatrooms'])) {
foreach($j['chatrooms'] as $room) {
$r = q("select * from xchat where xchat_url = '%s' and xchat_xchan = '%s' limit 1",
- dbesc($room['url'])
+ dbesc($room['url']),
+ dbesc($xchan)
);
if($r) {
q("update xchat set xchat_edited = '%s' where xchat_id = %d limit 1",
diff --git a/version.inc b/version.inc
index 5e33a16d7..ecdc97e53 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2014-02-25.599
+2014-02-26.600