From 8da8e02dc81d009c0c2637026f7bd598f2536fec Mon Sep 17 00:00:00 2001
From: Paolo Tacconi
Date: Mon, 19 Oct 2015 10:51:33 +0200
Subject: Replaced some old redmatrix branding
---
doc/README.md | 2 +-
images/hz-white-16.png | Bin 0 -> 384 bytes
images/hz-white-32.png | Bin 0 -> 610 bytes
images/hz-white-64.png | Bin 0 -> 874 bytes
view/tpl/email_notify_html.tpl | 2 +-
5 files changed, 2 insertions(+), 2 deletions(-)
create mode 100644 images/hz-white-16.png
create mode 100644 images/hz-white-32.png
create mode 100644 images/hz-white-64.png
diff --git a/doc/README.md b/doc/README.md
index 90585a906..09503efd7 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -5,7 +5,7 @@ Hubzilla
###Websites. Redefined.
-
+
**What are Hubs?**
diff --git a/images/hz-white-16.png b/images/hz-white-16.png
new file mode 100644
index 000000000..2f8f71c24
Binary files /dev/null and b/images/hz-white-16.png differ
diff --git a/images/hz-white-32.png b/images/hz-white-32.png
new file mode 100644
index 000000000..0549ca850
Binary files /dev/null and b/images/hz-white-32.png differ
diff --git a/images/hz-white-64.png b/images/hz-white-64.png
new file mode 100644
index 000000000..793a15789
Binary files /dev/null and b/images/hz-white-64.png differ
diff --git a/view/tpl/email_notify_html.tpl b/view/tpl/email_notify_html.tpl
index ae3e8c012..a2159c885 100755
--- a/view/tpl/email_notify_html.tpl
+++ b/view/tpl/email_notify_html.tpl
@@ -7,7 +7,7 @@
-  {{$product}} |
+  {{$product}} |
{{$preamble}} |
--
cgit v1.2.3
From 4b300f82747d6e0d6643e381ac55f388340cf501 Mon Sep 17 00:00:00 2001
From: Mario Vavti
Date: Mon, 19 Oct 2015 14:53:13 +0200
Subject: fix typo in include/notifier.php
---
include/notifier.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/notifier.php b/include/notifier.php
index b7cea629d..385062f07 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -127,7 +127,7 @@ function notifier_run($argv, $argc){
if($s) {
$perm_update = array('sender' => $s[0], 'recipient' => $r[0], 'success' => false, 'deliveries' => '');
- if($cmd == 'permission_create'])
+ if($cmd == 'permission_create')
call_hooks('permissions_create',$perm_update);
else
call_hooks('permissions_update',$perm_update);
--
cgit v1.2.3
From febcb90ece65798f169de491d30503770d7f90af Mon Sep 17 00:00:00 2001
From: Mario Vavti
Date: Mon, 19 Oct 2015 15:33:19 +0200
Subject: fix typo in mod/connedit.php
---
mod/connedit.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/mod/connedit.php b/mod/connedit.php
index 6170d05a8..65eba885a 100644
--- a/mod/connedit.php
+++ b/mod/connedit.php
@@ -190,7 +190,7 @@ function connedit_post(&$a) {
}
}
- $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending'];
+ $abook_pending = (($new_friend) ? 0 : $orig_record[0]['abook_pending']);
$r = q("UPDATE abook SET abook_profile = '%s', abook_my_perms = %d , abook_closeness = %d, abook_pending = %d,
abook_incl = '%s', abook_excl = '%s'
--
cgit v1.2.3