diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-01-17 21:34:12 +0100 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-01-18 09:56:32 +0100 |
commit | e26e2060f5470ce8bf4c5973284bae07b8af170a (patch) | |
tree | adf8512f93f5559ba87d0c9931969ae4ebea7133 /index.php | |
parent | cf92b4dd1521241eefc58eaf6dcd202cd83969d8 (diff) | |
download | Shaarli-e26e2060f5470ce8bf4c5973284bae07b8af170a.tar.gz Shaarli-e26e2060f5470ce8bf4c5973284bae07b8af170a.tar.zst Shaarli-e26e2060f5470ce8bf4c5973284bae07b8af170a.zip |
Add and update unit test for the new system (Bookmark + Service)
See #1307
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -631,7 +631,7 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM | |||
631 | // Get only bookmarks which have a thumbnail. | 631 | // Get only bookmarks which have a thumbnail. |
632 | // Note: we do not retrieve thumbnails here, the request is too heavy. | 632 | // Note: we do not retrieve thumbnails here, the request is too heavy. |
633 | $factory = new FormatterFactory($conf); | 633 | $factory = new FormatterFactory($conf); |
634 | $formatter = $factory->getFormatter(); | 634 | $formatter = $factory->getFormatter(); |
635 | foreach ($links as $key => $link) { | 635 | foreach ($links as $key => $link) { |
636 | if ($link->getThumbnail() !== false) { | 636 | if ($link->getThumbnail() !== false) { |
637 | $linksToDisplay[] = $formatter->format($link); | 637 | $linksToDisplay[] = $formatter->format($link); |
@@ -757,7 +757,7 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM | |||
757 | // Generate data. | 757 | // Generate data. |
758 | $feedGenerator = new FeedBuilder( | 758 | $feedGenerator = new FeedBuilder( |
759 | $bookmarkService, | 759 | $bookmarkService, |
760 | $factory->getFormatter('raw'), | 760 | $factory->getFormatter(), |
761 | $feedType, | 761 | $feedType, |
762 | $_SERVER, | 762 | $_SERVER, |
763 | $_GET, | 763 | $_GET, |
@@ -1452,7 +1452,7 @@ function renderPage($conf, $pluginManager, $bookmarkService, $history, $sessionM | |||
1452 | 1452 | ||
1453 | try { | 1453 | try { |
1454 | $factory = new FormatterFactory($conf); | 1454 | $factory = new FormatterFactory($conf); |
1455 | $formatter = $factory->getFormatter('raw'); | 1455 | $formatter = $factory->getFormatter('raw'); |
1456 | $PAGE->assign( | 1456 | $PAGE->assign( |
1457 | 'links', | 1457 | 'links', |
1458 | NetscapeBookmarkUtils::filterAndFormat( | 1458 | NetscapeBookmarkUtils::filterAndFormat( |