clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5891 from JonnyTischbein/move_module_contacts

Browse Source 
Move module contacts
This commit is contained in:
Hypolite Petovan
2018-10-14 16:42:50 -04:00
committed by GitHub
parent ce74a4d9a1 e41c59b193
commit 74c5f1f684
21 changed files with 1319 additions and 1330 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Content/Nav.php
+1 -1
View File
@@ -210,7 +210,7 @@ class Nav
$nav['profiles'] = ['profiles', L10n::t('Profiles'), '', L10n::t('Manage/Edit Profiles')];
}
$nav['contacts'] = ['contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
$nav['contacts'] = ['contact', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')];
}
// Show the link to the admin configuration page if user is admin
src/Model/Contact.php
+3 -3
View File
@@ -923,12 +923,12 @@ class Contact extends BaseObject
$poke_link = System::baseUrl() . '/poke/?f=&c=' . $contact['id'];
}
$contact_url = System::baseUrl() . '/contacts/' . $contact['id'];
$contact_url = System::baseUrl() . '/contact/' . $contact['id'];
$posts_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/conversations';
$posts_link = System::baseUrl() . '/contact/' . $contact['id'] . '/conversations';
if (!$contact['self']) {
$contact_drop_link = System::baseUrl() . '/contacts/' . $contact['id'] . '/drop?confirm=1';
$contact_drop_link = System::baseUrl() . '/contact/' . $contact['id'] . '/drop?confirm=1';
}
/**
src/Module/Contact.php
+1123
View File
File diff suppressed because it is too large Load Diff