Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-30 07:44:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7044 from MrPetovan/task/router

Browse source 
Move mod/admin to src/Module/Admin
This commit is contained in:
Philipp 2019-05-02 18:26:30 +02:00 • committed by GitHub
commit 774d04cd2f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
97 changed files with 3031 additions and 3894 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/Model/Contact.php
View file

@ -110,6 +110,20 @@ class Contact extends BaseObject
* @}
*/
/**
* @param array $fields Array of selected fields, empty for all
* @param array $condition Array of fields for condition
* @param array $params Array of several parameters
* @return array
* @throws \Exception
*/
public static function select(array $fields = [], array $condition = [], array $params = [])
{
$statement = DBA::select('contact', $fields, $condition, $params);
return DBA::toArray($statement);
}
/**
* @param integer $id
* @return array|boolean Contact record if it exists, false otherwise

4
src/Model/Item.php
View file

@ -3466,9 +3466,7 @@ class Item extends BaseObject
if (strpos($mime, 'video') !== false) {
if (!$vhead) {
$vhead = true;
$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'), [
'$baseurl' => System::baseUrl(),
]);
$a->page['htmlhead'] .= Renderer::replaceMacros(Renderer::getMarkupTemplate('videos_head.tpl'));
}
$url_parts = explode('/', $the_url);

2
src/Model/Profile.php
View file

@ -639,7 +639,6 @@ class Profile
}
$tpl = Renderer::getMarkupTemplate('birthdays_reminder.tpl');
return Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => $total,
'$event_reminders' => L10n::t('Birthday Reminders'),
@ -728,7 +727,6 @@ class Profile
}
$tpl = Renderer::getMarkupTemplate('events_reminder.tpl');
return Renderer::replaceMacros($tpl, [
'$baseurl' => System::baseUrl(),
'$classtoday' => $classtoday,
'$count' => count($r),
'$event_reminders' => L10n::t('Event Reminders'),