diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2019-07-25 16:51:48 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-07-25 16:51:48 +0200 |
| commit | 82611c9622ed23b0e9fcf5f9f651ddffa1fd7706 (patch) | |
| tree | fc2c97fd8dd84ec30473cb85b889d8326c9a831a /p/api | |
| parent | 744a9e8cf00aef7dec0acfa5f90f0dcfa2ef8837 (diff) | |
| parent | 042b40eeeea77db854daab1bec96fce5c2cdd4b2 (diff) | |
Merge pull request #2451 from FreshRSS/dev1.14.3
FreshRSS 1.14.3
Diffstat (limited to 'p/api')
| -rw-r--r-- | p/api/.htaccess | 2 | ||||
| -rw-r--r-- | p/api/greader.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/p/api/.htaccess b/p/api/.htaccess index 2bd6b1d14..dd3df0b4f 100644 --- a/p/api/.htaccess +++ b/p/api/.htaccess @@ -1,5 +1,5 @@ <IfModule mod_setenvif.c> - SetEnvIfNoCase "^Authorization$" "(.*)" HTTP_AUTHORIZATION=$1 + SetEnvIfNoCase "Authorization" "(.*)" HTTP_AUTHORIZATION=$1 </IfModule> <IfModule !mod_setenvif.c> <IfModule mod_rewrite.c> diff --git a/p/api/greader.php b/p/api/greader.php index 66732b799..3d628c855 100644 --- a/p/api/greader.php +++ b/p/api/greader.php @@ -347,7 +347,7 @@ function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = ' $c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8'); $cat = $categoryDAO->searchByName($c_name); $addCatId = $cat == null ? 0 : $cat->id(); - } else if ($remove != '' && strpos($remove, 'user/-/label/')) { + } elseif ($remove != '' && strpos($remove, 'user/-/label/') === 0) { $addCatId = 1; //Default category } $feedDAO = FreshRSS_Factory::createFeedDao(); @@ -998,7 +998,7 @@ if ($pathInfos[1] === 'accounts') { * (more efficient from a backend perspective than multiple requests). */ $streamId = $_GET['s']; streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation); - } else if ($pathInfos[6] === 'contents' && isset($_POST['i'])) { //FeedMe + } elseif ($pathInfos[6] === 'contents' && isset($_POST['i'])) { //FeedMe $e_ids = multiplePosts('i'); //item IDs streamContentsItems($e_ids, $order); } |