mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Coding convention:

Browse source 
- added curly braces
- added space between "if" and brace
- also added TODO (old-lost code?)

Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
Roland Häder 2016-12-20 10:39:06 +01:00 committed by Roland Haeder
parent f8a213e23b
commit 9b6ad2fc47
No known key found for this signature in database
GPG key ID: B72F8185C6C7BD78
3 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
mod/hcard.php
View file

@ -47,7 +47,11 @@ function hcard_init(App &$a) {
header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
<<<<<<< upstream/develop
foreach ($dfrn_pages as $dfrn) {
=======
foreach($dfrn_pages as $dfrn) {
>>>>>>> HEAD~65
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
}

1
mod/noscrape.php
View file

@ -26,6 +26,7 @@ function noscrape_init(App &$a) {
$keywords = str_replace(array('#',',',' ',',,'),array('',' ',',',','),$keywords);
$keywords = explode(',', $keywords);
/// @TODO This query's result is not being used (see below), maybe old-lost code?
$r = q("SELECT `photo` FROM `contact` WHERE `self` AND `uid` = %d",
intval($a->profile['uid']));

4
mod/profile.php
View file

@ -62,7 +62,11 @@ function profile_init(App &$a) {
header('Link: <' . App::get_baseurl() . '/xrd/?uri=' . $uri . '>; rel="lrdd"; type="application/xrd+xml"', false);
$dfrn_pages = array('request', 'confirm', 'notify', 'poll');
<<<<<<< upstream/develop
foreach ($dfrn_pages as $dfrn) {
=======
foreach($dfrn_pages as $dfrn) {
>>>>>>> HEAD~65
$a->page['htmlhead'] .= "<link rel=\"dfrn-{$dfrn}\" href=\"".App::get_baseurl()."/dfrn_{$dfrn}/{$which}\" />\r\n";
}
$a->page['htmlhead'] .= "<link rel=\"dfrn-poco\" href=\"".App::get_baseurl()."/poco/{$which}\" />\r\n";