diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-07-04 18:23:47 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-07-04 18:23:47 +0200 |
| commit | ad9458e85d319c12575293e0b25069d35db15720 (patch) | |
| tree | 83801af641b47e346bef0d72821b26e5d4cfb0fa /lib/mail.php | |
| parent | 32d69f68896c08e216bc0e84db409d00ec654856 (diff) | |
| parent | f67fc78531a0180d3c60edb849b29ac744bacbaa (diff) | |
| download | nextcloud-server-ad9458e85d319c12575293e0b25069d35db15720.tar.gz nextcloud-server-ad9458e85d319c12575293e0b25069d35db15720.zip | |
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
Diffstat (limited to 'lib/mail.php')
| -rw-r--r-- | lib/mail.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mail.php b/lib/mail.php index d6a383fe003..b339b33e962 100644 --- a/lib/mail.php +++ b/lib/mail.php @@ -113,9 +113,11 @@ class OC_Mail { */ public static function getfooter() { + $defaults = new OC_Defaults(); + $txt="\n--\n"; - $txt.=OC_Defaults::getName() . "\n"; - $txt.=OC_Defaults::getSlogan() . "\n"; + $txt.=$defaults->getName() . "\n"; + $txt.=$defaults->getSlogan() . "\n"; return($txt); |