diff options
| author | redmatrix <mike@macgirvin.com> | 2016-10-03 16:01:52 -0700 |
|---|---|---|
| committer | redmatrix <mike@macgirvin.com> | 2016-10-03 16:01:52 -0700 |
| commit | 2aa89795223961cccd43e1c300423920c55d8578 (patch) | |
| tree | 5fae53cdba2d15d17ab131eaac03d7359bc3605f | |
| parent | e93fdefd72fee99b486a0653f36526d591cde2bb (diff) | |
| parent | 5dc9de41ebd5cecf43678e7764d14f77ed1ff941 (diff) | |
| download | volse-hubzilla-2aa89795223961cccd43e1c300423920c55d8578.tar.gz volse-hubzilla-2aa89795223961cccd43e1c300423920c55d8578.tar.bz2 volse-hubzilla-2aa89795223961cccd43e1c300423920c55d8578.zip | |
Merge branch '1.14RC' of https://github.com/redmatrix/hubzilla into 1.14RC_merge
| -rw-r--r-- | CHANGELOG | 3 | ||||
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 4 |
2 files changed, 4 insertions, 3 deletions
@@ -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) diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index efb1c4307..9a8628968 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -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(); |