Coding convention:

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

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/mod/hcard.php b/mod/hcard.php
index d53405009a6fda34ebadaf3e447c605223c76134..8d79dd054634b8f9aab8fb71857fb0b2ba3ff9f5 100644 (file)
--- a/mod/hcard.php
+++ b/mod/hcard.php
@@ -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";
        }
 

diff --git a/mod/noscrape.php b/mod/noscrape.php
index 758ce8ba5316f1b889d605543d48892629a5aa43..33255f0fa4214e6c1df1dbb8897c3f778b598368 100644 (file)
--- a/mod/noscrape.php
+++ b/mod/noscrape.php
@@ -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']));
 

diff --git a/mod/profile.php b/mod/profile.php
index 8519f7e82ed616cbf06d618071a1816dcd663c77..28b508dc0e7b25ee0e9f90a4e6cf72041d022c05 100644 (file)
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -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";