harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '1.14RC' of https://github.com/redmatrix/hubzilla into 1.14RC_merge

Browse Source
This commit is contained in:
redmatrix 2016-10-03 16:01:52 -07:00
commit 2aa8979522
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -65,7 +65,8 @@ Hubzilla 1.14RC (2016-10-02)
- Public forum check with custom/expert permissions
Plugins
- Cdav: add support for recurring events
- Cdav security: fix rw permission check
- Cdav: add partial support for recurring events in the browser client (editing/creating is not implemented)
- New plugin phpmailer: use phpmailer class instead of php's built-in mail() function
- Diaspora: third party on other network comment issue
- Diaspora: comment fix (hubzilla originated comment with plugin activated by comment author not making it to Diaspora)

4
Zotlabs/Lib/Enotify.php
View File

@ -77,12 +77,12 @@ class Enotify {
$sender_email = get_config('system','from_email');
if(! $sender_email)
$sender_email = 'Administrator' . '@' . App::get_hostname();
$sender_email = 'Administrator' . '@' . \App::get_hostname();
$sender_name = get_config('system','from_email_name');
if(! $sender_name)
$sender_name = Zotlabs\Lib\System::get_site_name();
$sender_name = \Zotlabs\Lib\System::get_site_name();