diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-05 13:52:33 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2013-07-05 13:52:33 +0200 |
| commit | 59b700a5504549508ecde1f83469824840f55d90 (patch) | |
| tree | 90f867b7982d2b219713e6daf52576189a09fecb /core/templates/altmail.php | |
| parent | 13991be5ce6e318670b84458c2cdaa6878ad63cc (diff) | |
| parent | 9c855f7b3d97b312095ba53a08fe45b71ca06c98 (diff) | |
| download | nextcloud-server-59b700a5504549508ecde1f83469824840f55d90.tar.gz nextcloud-server-59b700a5504549508ecde1f83469824840f55d90.zip | |
Merge branch 'master' into fixing-3934-master
Conflicts:
core/js/share.js
Diffstat (limited to 'core/templates/altmail.php')
| -rw-r--r-- | core/templates/altmail.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/templates/altmail.php b/core/templates/altmail.php index 37dc8eee942..a7df29a2446 100644 --- a/core/templates/altmail.php +++ b/core/templates/altmail.php @@ -1,9 +1,9 @@ <?php +$defaults = new OC_Defaults(); + print_unescaped($l->t("Hey there,\n\njust letting you know that %s shared %s with you.\nView it: %s\n\nCheers!", array($_['user_displayname'], $_['filename'], $_['link']))); ?> -- -ownCloud - <?php -print_unescaped($l->t("web services under your control")); -?> -http://ownCloud.org +<?php p($defaults->getName() . ' - ' . $defaults->getSlogan()); ?> +<?php print_unescaped("\n".$defaults->getBaseUrl()); |