From 1ef55d7315bb44abe05f02ec8a84b6b6a557a9a0 Mon Sep 17 00:00:00 2001
From: Benjamin Bellamy <ben@podlibre.org>
Date: Thu, 10 Sep 2020 17:21:28 +0200
Subject: [PATCH] fix: correct php-fpm issues
---
app/Helpers/analytics_helper.php | 24 ++++++++++++++++++++++++
app/Models/EpisodeModel.php | 4 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/app/Helpers/analytics_helper.php b/app/Helpers/analytics_helper.php
index 5c02363d43..d0ca06cb1c 100644
--- a/app/Helpers/analytics_helper.php
+++ b/app/Helpers/analytics_helper.php
@@ -6,6 +6,30 @@
* @link https://castopod.org/
*/
+/**
+ * For compatibility with PHP-FPM v7.2 and below:
+ */
+if (!function_exists('getallheaders')) {
+ function getallheaders()
+ {
+ $headers = [];
+ foreach ($_SERVER as $name => $value) {
+ if (substr($name, 0, 5) == 'HTTP_') {
+ $headers[
+ str_replace(
+ ' ',
+ '-',
+ ucwords(
+ strtolower(str_replace('_', ' ', substr($name, 5)))
+ )
+ )
+ ] = $value;
+ }
+ }
+ return $headers;
+ }
+}
+
/**
* Set user country in session variable, for analytics purpose
*/
diff --git a/app/Models/EpisodeModel.php b/app/Models/EpisodeModel.php
index e569fef7e1..3ce3a8f616 100644
--- a/app/Models/EpisodeModel.php
+++ b/app/Models/EpisodeModel.php
@@ -270,7 +270,7 @@ class EpisodeModel extends Model
$sortNumberField =
$podcastType == 'serial'
? 'if(isnull(season_number),0,season_number)*1000+number'
- : 'UNIX_TIMESTAMP(published_at)';
+ : 'published_at';
$sortNumberValue =
$podcastType == 'serial'
? (empty($episode->season_number)
@@ -278,7 +278,7 @@ class EpisodeModel extends Model
: $episode->season_number) *
1000 +
$episode->number
- : strtotime($episode->published_at);
+ : $episode->published_at;
$previousData = $this->orderBy('(' . $sortNumberField . ') DESC')
->where([
--
GitLab