aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2016-10-26 21:52:53 -0700
committerzotlabs <mike@macgirvin.com>2016-10-26 21:52:53 -0700
commit2b3b5d2c8a5587c81d2c6abf46df7e74cb7f7d02 (patch)
treeb74ba12a675b9866465eb05034a6f2bd6f397986 /Zotlabs
parentd46fe209865d4b45bb4a27ec70744ee50a178dc7 (diff)
parent9e46409517c2f2fe1929d3332445aa8d8674c5ab (diff)
downloadvolse-hubzilla-2b3b5d2c8a5587c81d2c6abf46df7e74cb7f7d02.tar.gz
volse-hubzilla-2b3b5d2c8a5587c81d2c6abf46df7e74cb7f7d02.tar.bz2
volse-hubzilla-2b3b5d2c8a5587c81d2c6abf46df7e74cb7f7d02.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Connedit.php2
-rw-r--r--Zotlabs/Module/Events.php2
-rw-r--r--Zotlabs/Module/Like.php2
-rw-r--r--Zotlabs/Module/Photos.php2
-rw-r--r--Zotlabs/Module/Regdir.php2
5 files changed, 5 insertions, 5 deletions
diff --git a/Zotlabs/Module/Connedit.php b/Zotlabs/Module/Connedit.php
index c11d1ea16..cee593a5f 100644
--- a/Zotlabs/Module/Connedit.php
+++ b/Zotlabs/Module/Connedit.php
@@ -448,7 +448,7 @@ class Connedit extends \Zotlabs\Web\Controller {
}
if($cmd === 'resetphoto') {
- q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s' limit 1",
+ q("update xchan set xchan_photo_date = '2001-01-01 00:00:00' where xchan_hash = '%s'",
dbesc($orig_record[0]['xchan_hash'])
);
$cmd = 'refresh';
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 26455cf8e..347c94c50 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -707,7 +707,7 @@ class Events extends \Zotlabs\Web\Controller {
$sync_event = $r[0];
if($r) {
- $r = q("delete from event where event_hash = '%s' and uid = %d limit 1",
+ $r = q("delete from event where event_hash = '%s' and uid = %d",
dbesc($event_id),
intval(local_channel())
);
diff --git a/Zotlabs/Module/Like.php b/Zotlabs/Module/Like.php
index dd0bc99d4..43d318623 100644
--- a/Zotlabs/Module/Like.php
+++ b/Zotlabs/Module/Like.php
@@ -226,7 +226,7 @@ class Like extends \Zotlabs\Web\Controller {
$z[0]['deleted'] = 1;
build_sync_packet($ch[0]['channel_id'],array('likes' => $z));
- q("delete from likes where id = %d limit 1",
+ q("delete from likes where id = %d",
intval($z[0]['id'])
);
if($z[0]['i_mid']) {
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 3f0ab3ab0..e459469ef 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -259,7 +259,7 @@ class Photos extends \Zotlabs\Web\Controller {
@file_put_contents($r[0]['content'],$ph->imageString());
$data = $r[0]['content'];
$fsize = @filesize($r[0]['content']);
- q("update attach set filesize = %d where hash = '%s' and uid = %d limit 1",
+ q("update attach set filesize = %d where hash = '%s' and uid = %d",
intval($fsize),
dbesc($resource_id),
intval($page_owner_uid)
diff --git a/Zotlabs/Module/Regdir.php b/Zotlabs/Module/Regdir.php
index 208a2b384..f4d16c562 100644
--- a/Zotlabs/Module/Regdir.php
+++ b/Zotlabs/Module/Regdir.php
@@ -70,7 +70,7 @@ class Regdir extends \Zotlabs\Web\Controller {
if(! $result['success'])
$valid = 0;
- q("update site set site_valid = %d where site_url = '%s' limit 1",
+ q("update site set site_valid = %d where site_url = '%s'",
intval($valid),
strtolower($url)
);