diff --git a/include/poller.php b/include/poller.php
index 90e94ede9..755862eb6 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -205,6 +205,12 @@ function poller_max_connections_reached() {
*/
function poller_kill_stale_workers() {
$r = q("SELECT `pid`, `executed` FROM `workerqueue` WHERE `executed` != '0000-00-00 00:00:00'");
+
+ if (!is_array($r) || count($r) == 0) {
+ // No processing here needed
+ return;
+ }
+
foreach($r AS $pid)
if (!posix_kill($pid["pid"], 0))
q("UPDATE `workerqueue` SET `executed` = '0000-00-00 00:00:00', `pid` = 0 WHERE `pid` = %d",
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 2741ad59b..545599606 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -42,8 +42,10 @@ function dfrn_request_init(&$a) {
if(! function_exists('dfrn_request_post')) {
function dfrn_request_post(&$a) {
- if(($a->argc != 2) || (! count($a->profile)))
+ if(($a->argc != 2) || (! count($a->profile))) {
+ logger('Wrong count of argc or profiles: argc=' . $a->argc . ',profile()=' . count($a->profile));
return;
+ }
if(x($_POST, 'cancel')) {
@@ -461,7 +463,7 @@ function dfrn_request_post(&$a) {
$network = NETWORK_DFRN;
}
- logger('dfrn_request: url: ' . $url);
+ logger('dfrn_request: url: ' . $url . ',network=' . $network, LOGGER_DEBUG);
if($network === NETWORK_DFRN) {
$ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1",
@@ -825,7 +827,7 @@ function dfrn_request_content(&$a) {
else
$tpl = get_markup_template('auto_request.tpl');
- $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:");
+ $page_desc = t("Please enter your 'Identity Address' from one of the following supported communications networks:");
// see if we are allowed to have NETWORK_MAIL2 contacts
@@ -850,7 +852,7 @@ function dfrn_request_content(&$a) {
get_server()
);
- $o .= replace_macros($tpl,array(
+ $o = replace_macros($tpl,array(
'$header' => t('Friend/Connection Request'),
'$desc' => t('Examples: jojo@demo.friendica.com, http://demo.friendica.com/profile/jojo, testuser@identi.ca'),
'$pls_answer' => t('Please answer the following:'),
diff --git a/view/theme/vier/css/font2.css b/view/theme/vier/css/font2.css
index 4300a910c..a62cffc00 100644
--- a/view/theme/vier/css/font2.css
+++ b/view/theme/vier/css/font2.css
@@ -228,6 +228,7 @@ li.icon.icon-large:before {
.icon-key:before { content: "\f084"; }
.icon.gears:before { content: "\f085"; }
.icon-comments:before { content: "\f086"; }
+.icon-commenting:before { content: "\f27a"; }
.icon.like:before { content: "\f087"; }
.icon.dislike:before { content: "\f088"; }
.icon-star-half:before { content: "\f089"; }
diff --git a/view/theme/vier/font/FontAwesome.otf b/view/theme/vier/font/FontAwesome.otf
index 81c9ad949..3ed7f8b48 100644
Binary files a/view/theme/vier/font/FontAwesome.otf and b/view/theme/vier/font/FontAwesome.otf differ
diff --git a/view/theme/vier/font/fontawesome-webfont.eot b/view/theme/vier/font/fontawesome-webfont.eot
old mode 100755
new mode 100644
index 84677bc0c..9b6afaedc
Binary files a/view/theme/vier/font/fontawesome-webfont.eot and b/view/theme/vier/font/fontawesome-webfont.eot differ
diff --git a/view/theme/vier/font/fontawesome-webfont.svg b/view/theme/vier/font/fontawesome-webfont.svg
old mode 100755
new mode 100644
index d907b25ae..d05688e9e
--- a/view/theme/vier/font/fontawesome-webfont.svg
+++ b/view/theme/vier/font/fontawesome-webfont.svg
@@ -147,14 +147,14 @@
-
+
-
+
@@ -219,8 +219,8 @@
-
-
+
+
@@ -275,7 +275,7 @@
-
+
@@ -362,7 +362,7 @@
-
+
@@ -399,7 +399,7 @@
-
+
@@ -410,9 +410,9 @@
-
-
-
+
+
+
@@ -438,7 +438,7 @@
-
+
@@ -454,12 +454,12 @@
-
+
-
+
@@ -483,13 +483,13 @@
-
+
-
+
@@ -513,8 +513,143 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/view/theme/vier/font/fontawesome-webfont.ttf b/view/theme/vier/font/fontawesome-webfont.ttf
old mode 100755
new mode 100644
index 96a3639cd..26dea7951
Binary files a/view/theme/vier/font/fontawesome-webfont.ttf and b/view/theme/vier/font/fontawesome-webfont.ttf differ
diff --git a/view/theme/vier/font/fontawesome-webfont.woff b/view/theme/vier/font/fontawesome-webfont.woff
old mode 100755
new mode 100644
index 628b6a52a..dc35ce3c2
Binary files a/view/theme/vier/font/fontawesome-webfont.woff and b/view/theme/vier/font/fontawesome-webfont.woff differ
diff --git a/view/theme/vier/font/fontawesome-webfont.woff2 b/view/theme/vier/font/fontawesome-webfont.woff2
new file mode 100644
index 000000000..500e51725
Binary files /dev/null and b/view/theme/vier/font/fontawesome-webfont.woff2 differ
diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl
index 267b35df7..c9ee77081 100644
--- a/view/theme/vier/templates/wall_thread.tpl
+++ b/view/theme/vier/templates/wall_thread.tpl
@@ -91,7 +91,7 @@
{{if $item.threaded}}
{{/if}}
{{if $item.comment}}
-
+
{{/if}}
{{if $item.isevent}}