aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-28 13:13:59 -0700
committerredmatrix <git@macgirvin.com>2016-07-28 13:13:59 -0700
commit2d916b531b0078002232209907b414b6e2a07722 (patch)
treed9ebbec71f42ac0c7987718f90adbd98900d1875
parent12952c982128564e4b0c2add182e4ec6eb53430c (diff)
downloadvolse-hubzilla-2d916b531b0078002232209907b414b6e2a07722.tar.gz
volse-hubzilla-2d916b531b0078002232209907b414b6e2a07722.tar.bz2
volse-hubzilla-2d916b531b0078002232209907b414b6e2a07722.zip
Revert "issue #466, sql typo"
This reverts commit 4ce8f965aab8cfb09fc9f102f771cf67a7ee84fa.
-rw-r--r--Zotlabs/Module/Ping.php2
-rw-r--r--include/api.php2
-rw-r--r--library/asn1.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/Zotlabs/Module/Ping.php b/Zotlabs/Module/Ping.php
index e01c3b49a..5cbf45daa 100644
--- a/Zotlabs/Module/Ping.php
+++ b/Zotlabs/Module/Ping.php
@@ -173,7 +173,7 @@ class Ping extends \Zotlabs\Web\Controller {
);
break;
case 'all_events':
- $r = q("update event set `dismissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
+ $r = q("update event set `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
intval(local_channel()),
dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + ' . intval($evdays) . ' days')),
dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
diff --git a/include/api.php b/include/api.php
index b11e2c351..df6aba957 100644
--- a/include/api.php
+++ b/include/api.php
@@ -13,7 +13,7 @@ require_once('include/api_auth.php');
/*
*
- * Hubzilla API. Loosely based on and possibly compatible with Twitter-Like (v1.0) API but all similarities end there.
+ * Red API. Loosely based on and possibly compatible with a Twitter-Like API but all similarities end there.
*
*/
diff --git a/library/asn1.php b/library/asn1.php
index 6ab8c6210..e84398bf6 100644
--- a/library/asn1.php
+++ b/library/asn1.php
@@ -159,7 +159,7 @@ class ASN_BASE {
}
$length = $tempLength;
}
- $data = substr($string, $p, intval($length));
+ $data = substr($string, $p, $length);
$parsed[] = self::parseASNData($type, $data, $level, $maxLevels);
$p = $p + $length;
}