From 4949c34426badbf5aeb3853c7a081a5c25d37ba2 Mon Sep 17 00:00:00 2001
From: Paul Weidner <paul.weidner@gmail.com>
Date: Thu, 21 Apr 2022 11:13:42 -0700
Subject: [PATCH] Do not check php-geos requirement in the update phase #526

---
 CHANGELOG.md                      | 4 ++++
 modules/core/geo/farm_geo.install | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6fbbc4a94..d825c814b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [Issue #3275161: Allow IMG tags in default text format](https://www.drupal.org/project/farm/issues/3275161)
 
+### Fixed
+
+- [Do not check php-geos requirement in the update phase #526](https://github.com/farmOS/farmOS/pull/526)
+
 ### Security
 
 - Update Drupal core to 9.3.12 for [SA-CORE-2022-008](https://www.drupal.org/sa-core-2022-008) and
diff --git a/modules/core/geo/farm_geo.install b/modules/core/geo/farm_geo.install
index 3f314213d..7b2260e99 100644
--- a/modules/core/geo/farm_geo.install
+++ b/modules/core/geo/farm_geo.install
@@ -11,6 +11,12 @@
 function farm_geo_requirements($phase) {
   $requirements = [];
 
+  // Do not check requirements in the update phase.
+  // The REQUIREMENT_WARNING severity prevents updates from being run.
+  if ($phase == 'update') {
+    return $requirements;
+  }
+
   // Check for php-geos extension.
   if (geoPHP::geosInstalled()) {
     $severity = REQUIREMENT_OK;