Merge branch 'feat/journal-post-form'

# Conflicts:
#	Makefile
#	docs/working/backlog.md
#	user

Makefile

@@ -28,7 +28,8 @@ REMOTE_TARGETS := remote-env-setup remote-env-remove remote-wipe remote-install
 	remote-upgrade-grav remote-git-sync-disable remote-git-sync-enable \
 	remote-content-status remote-clean remote-diag remote-apply-env \
 	remote-seed-api-salt remote-secrets-audit \
-	remote-gpm-install remote-maintenance-on remote-maintenance-off
+	remote-gpm-install remote-maintenance-on remote-maintenance-off \
+	remote-apply-plugin-patches
 ENVS := test prod
 
 guard-env:
@@ -90,6 +91,19 @@ fix-perms:
 
 install-plugins:
 	docker exec -w /var/www/html intotheeast_grav php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y
+	$(MAKE) apply-plugin-patches
+
+# Re-apply local fixes to git-ignored, GPM-managed third-party plugins. Run this
+# AFTER install-plugins (which overwrites them). See deploy/patches/README.md.
+apply-plugin-patches:
+	@for p in deploy/patches/*.patch; do \
+	  [ -f "$$p" ] || continue; \
+	  if git apply --check "$$p" >/dev/null 2>&1; then \
+	    git apply "$$p" && echo "applied $$p"; \
+	  else \
+	    echo "skipped $$p (already applied or does not match)"; \
+	  fi; \
+	done
 
 # ── Demo content ──────────────────────────────────────────────────────────────
 
@@ -165,9 +179,24 @@ remote-fetch-content: guard-env
 
 remote-install-plugins: guard-env
 	$(SSH) "cd $(WEBROOT) && php bin/gpm index -f && php bin/gpm install $(shell cat plugins.txt | tr '\n' ' ') -y"
+	$(MAKE) remote-apply-plugin-patches
 
 remote-update-plugins: guard-env
 	$(SSH) "cd $(WEBROOT) && php bin/gpm update -y && php bin/grav cache"
+	$(MAKE) remote-apply-plugin-patches
+
+# Re-apply local fixes to git-ignored, GPM-managed third-party plugins on the
+# remote (pristine after a GPM install/update). Piped over SSH like the git-sync
+# scripts — no scp. `--forward` makes it a no-op when already applied. Runs
+# automatically after remote-install-plugins / remote-update-plugins; safe to run
+# standalone. See deploy/patches/README.md.
+remote-apply-plugin-patches: guard-env
+	@for p in deploy/patches/*.patch; do \
+	  [ -f "$$p" ] || continue; \
+	  echo "remote-apply $$p"; \
+	  $(SSH) "cd $(WEBROOT) && patch -p1 --forward -r - --no-backup-if-mismatch" < "$$p" || echo "  (already applied or no-op)"; \
+	done
+	$(SSH) "cd $(WEBROOT) && php bin/grav clearcache"
 
 remote-upgrade-grav: guard-env
 	$(SSH) "cd $(WEBROOT) && php bin/gpm self-upgrade -y && php bin/grav cache"