aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2013-02-08 16:26:00 -0800
committerfriendica <info@friendica.com>2013-02-08 16:26:00 -0800
commitce95b1f68c5dccddeade704528c56917936a4e52 (patch)
treeedc570cd01573bc91ee13fae4957b3a2e8a8165e
parent62afdf38202ee9f09011bef599506e3a5ee37528 (diff)
downloadvolse-hubzilla-ce95b1f68c5dccddeade704528c56917936a4e52.tar.gz
volse-hubzilla-ce95b1f68c5dccddeade704528c56917936a4e52.tar.bz2
volse-hubzilla-ce95b1f68c5dccddeade704528c56917936a4e52.zip
clean up some sql errors from the logs
-rw-r--r--include/group.php2
-rw-r--r--include/socgraph.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/include/group.php b/include/group.php
index 3a2fe7a3c..6042acbb4 100644
--- a/include/group.php
+++ b/include/group.php
@@ -31,7 +31,7 @@ function group_add($uid,$name) {
$dups = false;
$hash = random_string() . $name;
- $r = q("SELECT id FROM group WHERE hash = '%s' LIMIT 1", dbesc($hash));
+ $r = q("SELECT id FROM `group` WHERE hash = '%s' LIMIT 1", dbesc($hash));
if($r)
$dups = true;
} while($dups == true);
diff --git a/include/socgraph.php b/include/socgraph.php
index 6b7ee1066..7e2d65bb4 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -137,7 +137,7 @@ function poco_load($xchan = null,$url = null) {
}
logger("poco_load: loaded $total entries",LOGGER_DEBUG);
- q("delete from xlink where xlink_xchan = '%s' and xlink_updated` < UTC_TIMESTAMP() - INTERVAL 2 DAY",
+ q("delete from xlink where xlink_xchan = '%s' and xlink_updated < UTC_TIMESTAMP() - INTERVAL 2 DAY",
dbesc($xchan)
);
}
@@ -146,7 +146,7 @@ function poco_load($xchan = null,$url = null) {
function count_common_friends($uid,$xchan) {
$r = q("SELECT count(xlink_id) as total from xlink where xlink_xchan = '%s' and xlink_link in
- (select abook_chan from abook where abook_xchan != '%s' and abook_channel = %d and abook_flags = 0 )",
+ (select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_flags = 0 )",
dbesc($xchan),
dbesc($xchan),
intval($uid)
@@ -166,7 +166,7 @@ function common_friends($uid,$xchan,$start = 0,$limit=100000000,$shuffle = false
$sql_extra = " order by xchan_name asc ";
$r = q("SELECT * from xchan left join xlink on xlink_xchan = xchan_hash where xlink_xchan = '%s' and xlink_link in
- (select abook_chan from abook where abook_xchan != '%s' and abook_channel = %d and abook_flags = 0 ) $sql_extra limit %d, %d",
+ (select abook_xchan from abook where abook_xchan != '%s' and abook_channel = %d and abook_flags = 0 ) $sql_extra limit %d, %d",
dbesc($xchan),
dbesc($xchan),
intval($uid),