From 99a1d0f81d46e261931959c8014596f1362b76a6 Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Fri, 15 Dec 2023 13:38:40 -0500
Subject: [PATCH] Update InputfieldImage and ProcessPageEditImageSelect to
 recognize version in URLs

---
 .../InputfieldImage/InputfieldImage.module           | 12 +++++++++---
 .../ProcessPageEditImageSelect.module                |  3 +++
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/wire/modules/Inputfield/InputfieldImage/InputfieldImage.module b/wire/modules/Inputfield/InputfieldImage/InputfieldImage.module
index 9391df5c..f6d4b47c 100755
--- a/wire/modules/Inputfield/InputfieldImage/InputfieldImage.module
+++ b/wire/modules/Inputfield/InputfieldImage/InputfieldImage.module
@@ -1138,11 +1138,15 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
 	 * 
 	 */
 	protected function getVariationUrl($pagefile, $id) {
+		$page = $pagefile->page;
+		$pageId = $page->id;
+		$version = (int) ((string) $page->get('_version'));
 		return $this->wire()->config->urls->admin . "page/image/variations/" . 
-			"?id={$pagefile->page->id}" . 
+			"?id=$pageId" . 
 			"&file=$pagefile->name" . 
 			"&modal=1" . 
-			"&varcnt=varcnt_$id";
+			"&varcnt=varcnt_$id" . 
+			"&version=$version";
 	}
 
 	/**
@@ -1166,11 +1170,13 @@ class InputfieldImage extends InputfieldFile implements InputfieldItemList, Inpu
 	 */
 	protected function getEditUrl(Pagefile $pagefile, $pageID) {
 		$name = $this->editFieldName ? $this->editFieldName : $this->name;
+		$version = (int) ((string) $pagefile->page->get('_version'));
 		return $this->wire()->config->urls->admin . "page/image/edit/" . 
 			"?id=$pageID" . 
 			"&file=$pageID,$pagefile->name" . 
 			"&rte=0" . 
-			"&field=$name";
+			"&field=$name" . 
+			"&version=$version";
 	}
 
 	/**
diff --git a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
index 90d97923..8f23d22e 100644
--- a/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
+++ b/wire/modules/Process/ProcessPageEditImageSelect/ProcessPageEditImageSelect.module
@@ -694,6 +694,9 @@ class ProcessPageEditImageSelect extends Process implements ConfigurableModule {
 		$file = basename($file); 
 		$id = isset($parts['id']) ? (int) $parts['id'] : $this->page->id; 
 		
+		$version = isset($parts['version']) ? (int) $parts['version'] : (int) $input->get('version');
+		if($version > 0) $parts['version'] = $version;
+		
 		if(!isset($parts['modal'])) $parts['modal'] = 1;
 		if(!isset($parts['edit_page_id']) && $this->editorPage) $parts['edit_page_id'] = $this->editorPage->id; 
 		if(!isset($parts['hidpi'])) $parts['hidpi'] = (int) $this->hidpi;