aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-07-31 07:38:44 -0400
committerAndrew Manning <tamanning@zoho.com>2016-07-31 07:38:44 -0400
commit42b718b3e0fcd44c734a3faf385b29d05c614fe3 (patch)
tree2da9feeccd41afe24ac6c73c3ce88e2df43ac9ef
parent1e3a645abedcd77c10a855f1e821dfe7fc072aeb (diff)
parentda9b6690e565452a9a9d69084a07ac48005d7e60 (diff)
downloadvolse-hubzilla-42b718b3e0fcd44c734a3faf385b29d05c614fe3.tar.gz
volse-hubzilla-42b718b3e0fcd44c734a3faf385b29d05c614fe3.tar.bz2
volse-hubzilla-42b718b3e0fcd44c734a3faf385b29d05c614fe3.zip
Merge remote-tracking branch 'upstream/dev' into website-import
-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 5cbf45daa..e01c3b49a 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 `dimissed` = 1 where `dismissed` = 0 and uid = %d AND dtstart < '%s' AND dtstart > '%s' ",
+ $r = q("update event set `dismissed` = 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 f52b03240..2587a72bb 100644
--- a/include/api.php
+++ b/include/api.php
@@ -13,7 +13,7 @@ require_once('include/api_auth.php');
/*
*
- * Red API. Loosely based on and possibly compatible with a Twitter-Like API but all similarities end there.
+ * Hubzilla API. Loosely based on and possibly compatible with Twitter-Like (v1.0) API but all similarities end there.
*
*/
diff --git a/library/asn1.php b/library/asn1.php
index e84398bf6..6ab8c6210 100644
--- a/library/asn1.php
+++ b/library/asn1.php
@@ -159,7 +159,7 @@ class ASN_BASE {
}
$length = $tempLength;
}
- $data = substr($string, $p, $length);
+ $data = substr($string, $p, intval($length));
$parsed[] = self::parseASNData($type, $data, $level, $maxLevels);
$p = $p + $length;
}