Knah-Tsaeb
/
MyShaarli
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #662 from virtualtam/fix/feed/self-link 

Fix: return the proper value for the "self" feed attribute
This commit is contained in:
VirtualTam 2016-10-17 17:58:39 +02:00 committed by GitHub
parent 209aa96e7e 44a718090d
commit 8406a4b670
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/FeedBuilder.php
View File

@ -124,7 +124,8 @@ class FeedBuilder
$data['last_update'] = $this->getLatestDateFormatted();
$data['show_dates'] = !$this->hideDates || $this->isLoggedIn;
// Remove leading slash from REQUEST_URI.
$data['self_link'] = $pageaddr . escape(ltrim($this->serverInfo['REQUEST_URI'], '/'));
$data['self_link'] = escape(server_url($this->serverInfo))
. escape($this->serverInfo['REQUEST_URI']);
$data['index_url'] = $pageaddr;
$data['usepermalinks'] = $this->usePermalinks === true;
$data['links'] = $linkDisplayed;

33
tests/FeedBuilderTest.php
View File

@ -217,4 +217,37 @@ class FeedBuilderTest extends PHPUnit_Framework_TestCase
$this->assertEquals(ReferenceLinkDB::$NB_LINKS_TOTAL, count($data['links']));
$this->assertEquals('http://pubsubhub.io', $data['pubsubhub_url']);
}
/**
* Test buildData when Shaarli is served from a subdirectory
*/
public function testBuildDataServerSubdir()
{
$serverInfo = array(
'HTTPS' => 'Off',
'SERVER_NAME' => 'host.tld',
'SERVER_PORT' => '8080',
'SCRIPT_NAME' => '/~user/shaarli/index.php',
'REQUEST_URI' => '/~user/shaarli/index.php?do=feed',
);
$feedBuilder = new FeedBuilder(
self::$linkDB,
FeedBuilder::$FEED_ATOM,
$serverInfo,
null,
false
);
$feedBuilder->setLocale(self::$LOCALE);
$data = $feedBuilder->buildData();
$this->assertEquals(
'http://host.tld:8080/~user/shaarli/index.php?do=feed',
$data['self_link']
);
// Test first link (note link)
$link = array_shift($data['links']);
$this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['guid']);
$this->assertEquals('http://host.tld:8080/~user/shaarli/?WDWyig', $link['url']);
}
}