diff --git a/boot.php b/boot.php index c20f48cfa4..bbfd671955 100644 --- a/boot.php +++ b/boot.php @@ -1801,9 +1801,13 @@ function proc_run($cmd){ $priority = 2; if (!$found) - q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`) - VALUES ('%s', '%s', '%s', %d)", - dbesc($funcname), + // quickfix for the delivery problems, 2106-07-28 + /// @todo find better solution + //q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`) + // VALUES ('%s', '%s', '%s', %d)", + // dbesc($funcname), + q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`) + VALUES ('%s', '%s', %d)", dbesc($parameters), dbesc(datetime_convert()), intval($priority)); diff --git a/library/asn1.php b/library/asn1.php index e84398bf62..ac14a5b16f 100644 --- a/library/asn1.php +++ b/library/asn1.php @@ -4,6 +4,7 @@ // Attribution: http://www.krisbailey.com // license: unknown // modified: Mike Macgrivin mike@macgirvin.com 6-oct-2010 to support Salmon auto-discovery +// modified: Tobias Diekershoff 28-jul-2016 adding an intval in line 162 to make PHP7 happy // from openssl public keys @@ -159,7 +160,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; } diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl index b4217aa436..6170dcef82 100644 --- a/view/theme/frio/templates/contact_edit.tpl +++ b/view/theme/frio/templates/contact_edit.tpl @@ -91,7 +91,7 @@ {{if $keywords}}