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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source 
Conflicts:
	include/bb2diaspora.php
	include/diaspora.php
	include/enotify.php
	mod/admin.php
	mod/cloud.php
	mod/dav.php
	mod/home.php
	mod/invite.php
	mod/like.php
	mod/mitem.php
	mod/p.php
	mod/pubsites.php
	mod/setup.php
	mod/siteinfo.php
	util/messages.po
This commit is contained in:
redmatrix
2015-05-17 19:48:57 -07:00
parent dd72f580dd ac3b886cc4
commit 76558df966
29 changed files with 602 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mod/cloud.php
View File

@@ -117,7 +117,7 @@ function cloud_init(&$a) {
if ((! $auth->observer) && (! $isapublic_file) && (! $davguest)) {
try {
$auth->Authenticate($server, t('Hubzilla - Guests: Username: {your email address}, Password: +++'));
$auth->Authenticate($server, t('$Projectname - Guests: Username: {your email address}, Password: +++'));
}
catch (Exception $e) {
logger('mod_cloud: auth exception' . $e->getMessage());