clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1607-api-generic-xml

This commit is contained in:
Michael Vogel 2016-07-30 10:02:39 +02:00
parent 287c9cfbdd 89227813fc
commit 313bc5b0d2
3 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
boot.php
View File

@ -1801,9 +1801,13 @@ function proc_run($cmd){
$priority = 2; $priority = 2;
if (!$found) if (!$found)
q("INSERT INTO `workerqueue` (`function`, `parameter`, `created`, `priority`) // quickfix for the delivery problems, 2106-07-28
VALUES ('%s', '%s', '%s', %d)", /// @todo find better solution
dbesc($funcname), //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($parameters),
dbesc(datetime_convert()), dbesc(datetime_convert()),
intval($priority)); intval($priority));

3
library/asn1.php
View File

@ -4,6 +4,7 @@
// Attribution: http://www.krisbailey.com // Attribution: http://www.krisbailey.com
// license: unknown // license: unknown
// modified: Mike Macgrivin mike@macgirvin.com 6-oct-2010 to support Salmon auto-discovery // 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 // from openssl public keys
@ -159,7 +160,7 @@ class ASN_BASE {
} }
$length = $tempLength; $length = $tempLength;
} }
$data = substr($string, $p, $length); $data = substr($string, $p, intval($length));
$parsed[] = self::parseASNData($type, $data, $level, $maxLevels); $parsed[] = self::parseASNData($type, $data, $level, $maxLevels);
$p = $p + $length; $p = $p + $length;
} }

2
view/theme/frio/templates/contact_edit.tpl
View File

@ -91,7 +91,7 @@
{{if $keywords}} {{if $keywords}}
<div class="col-lg-12 col-md-12 col-sm-12 col-xs-12"> <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{$keywords_label}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords}}</div>
</div> </div>
{{/if}} {{/if}}