From: nodiscc <nodiscc@gmail.com>
Date: Tue, 23 Jun 2015 22:51:38 +0000 (+0200)
Subject: Merge remote-tracking branch 'ArthurHoaro/input-escape' into next
X-Git-Tag: v0.5.0~26
X-Git-Url: https://git.immae.eu/?p=github%2Fshaarli%2FShaarli.git;a=commitdiff_plain;h=eaefcba724e93c5f6b426ad8855ab1af8ac8212a

Merge remote-tracking branch 'ArthurHoaro/input-escape' into next

Conflicts:
	index.php
---

eaefcba724e93c5f6b426ad8855ab1af8ac8212a
diff --cc index.php
index f116a87b,39b01a2e..dd3ec3a4
--- a/index.php
+++ b/index.php
@@@ -781,10 -791,7 +795,11 @@@ function showATOM(
      $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; }
      // If cached was not found (or not usable), then read the database and build the response:
  
 -    $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']);  // Read links from database (and filter private links if used it not logged in).
++// Read links from database (and filter private links if used it not logged in).
 +    $LINKSDB = new LinkDB(
 +        isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'],
 +        $GLOBALS['config']['HIDE_PUBLIC_LINKS']
 +    );
  
      // Optionally filter the results:
      $linksToDisplay=array();
@@@ -865,11 -872,7 +880,12 @@@ function showDailyRSS(
      $cache = new pageCache(pageUrl(),startsWith($query,'do=dailyrss') && !isLoggedIn());
      $cached = $cache->cachedVersion(); if (!empty($cached)) { echo $cached; exit; }
      // If cached was not found (or not usable), then read the database and build the response:
 -    $LINKSDB = new LinkDB(isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI']);  // Read links from database (and filter private links if used it not logged in).
 +
++// Read links from database (and filter private links if used it not logged in).
 +    $LINKSDB = new LinkDB(
 +        isLoggedIn() || $GLOBALS['config']['OPEN_SHAARLI'],
 +        $GLOBALS['config']['HIDE_PUBLIC_LINKS']
 +    );
  
      /* Some Shaarlies may have very few links, so we need to look
         back in time (rsort()) until we have enough days ($nb_of_days).