Merge branch 'release/1.4.1'

getgrav · May 8, 2023 · 9b51ef6 · 9b51ef6
2 parents fee2bf2 + 09579c0
commit 9b51ef6
Show file tree

Hide file tree

Showing 15 changed files with 619 additions and 54 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.4.1
+## 05/08/2023
+
+1. [](#improved)   
+   * Fixed a deprecated message where `null` was being passed to `strip_tags()` function
+
 # v1.4.0
 ## 05/13/2020
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,5 +1,5 @@
 name: Reading Time
-version: 1.4.0
+version: 1.4.1
 description: "Add human readable reading time to your pages."
 icon: clock-o
 author:

diff --git a/classes/TwigReadingTimeFilters.php b/classes/TwigReadingTimeFilters.php
@@ -49,7 +49,7 @@ public function getReadingTime( $content, $params = array() )
 
     $options = array_merge($this->grav['config']->get('plugins.readingtime'), $params);
 
-    $words = count(preg_split('/\s+/', strip_tags($content)) ?: []);
+    $words = count(preg_split('/\s+/', strip_tags((string) $content)) ?: []);
     $wpm = $options['words_per_minute'];
 
     $minutes_short_count = floor($words / $wpm);

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -2,6 +2,24 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    if (!headers_sent()) {
+        header('HTTP/1.1 500 Internal Server Error');
+    }
+    $err = 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    if (!ini_get('display_errors')) {
+        if (PHP_SAPI === 'cli' || PHP_SAPI === 'phpdbg') {
+            fwrite(STDERR, $err);
+        } elseif (!headers_sent()) {
+            echo $err;
+        }
+    }
+    trigger_error(
+        $err,
+        E_USER_ERROR
+    );
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
 return ComposerAutoloaderInitba8cc29b2b127a27a57127d33945f8aa::getLoader();