PHP8.1 Apply latest ZF1F changes to patch OM-918 (#2936)

OpenMage · Jan 15, 2023 · 869fc36 · 869fc36
1 parent 7d068c1
commit 869fc36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.ddev/commands/web/vendor-patches b/.ddev/commands/web/vendor-patches
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+## Description: create Vendor Patches
+## Usage: vendor-patches
+## Example: ddev vendor-patches
+
+php vendor/bin/vendor-patches generate
diff --git a/patches/OM-918.patch b/patches/OM-918.patch
@@ -14,12 +14,9 @@
       * Read the content from locale
       *
       * Can be called like:
-@@ -333,10 +340,17 @@
-             $val = implode('_' , $value);
-         }
-
--        $val = urlencode((string) $val);
-+        $val = urlencode($val);
+@@ -335,8 +342,15 @@
+
+         $val = urlencode((string) $val);
          $id  = self::_filterCacheId('Zend_LocaleL_' . $locale . '_' . $path . '_' . $val);
 +
 +        // add runtime cache to avoid calling cache backend multiple times during one request