From 21949387b47342fdb498cc645c3bf300e9f6fc0a Mon Sep 17 00:00:00 2001
From: Ryan Cramer <ryan@processwire.com>
Date: Thu, 28 Mar 2024 09:01:54 -0400
Subject: [PATCH] Various minor updates

---
 wire/core/Session.php                                        | 2 +-
 wire/modules/AdminTheme/AdminThemeUikit/controller.php       | 2 +-
 .../Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module     | 5 +++++
 wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPage.php    | 5 ++---
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/wire/core/Session.php b/wire/core/Session.php
index 5ece1120..d1cc7b73 100644
--- a/wire/core/Session.php
+++ b/wire/core/Session.php
@@ -381,7 +381,7 @@ class Session extends Wire implements \IteratorAggregate {
 			// if valid, update last request time
 			$this->set('_user', 'ts', time());
 			
-		} else if($reason && $userID && $userID != $this->wire('config')->guestUserPageID) {
+		} else if($reason && $userID && $userID != $this->config->guestUserPageID) {
 			// otherwise log the invalid session
 			$user = $this->wire()->users->get((int) $userID);
 			if($user && $user->id) $reason = "User '$user->name' - $reason";
diff --git a/wire/modules/AdminTheme/AdminThemeUikit/controller.php b/wire/modules/AdminTheme/AdminThemeUikit/controller.php
index 1d3d3467..c919f37b 100644
--- a/wire/modules/AdminTheme/AdminThemeUikit/controller.php
+++ b/wire/modules/AdminTheme/AdminThemeUikit/controller.php
@@ -6,7 +6,7 @@ if(!defined("PROCESSWIRE")) die();
  * This file is just here for backwards compatibility
  *
  * It is called by /site/templates/admin.php on sites running a /site/templates/ dir from before the admin
- * controller was move to the /wire/core/admin.php dir. 
+ * controller was moved to the /wire/core/admin.php dir. 
  *
  * This file need not be present in new admin themes, and will eventually be removed from this theme.
  *
diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module
index 605ddc5d..d34762bc 100644
--- a/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module
+++ b/wire/modules/Fieldtype/FieldtypeRepeater/FieldtypeRepeater.module
@@ -1369,6 +1369,7 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule, Fieldty
 
 		// remove unpublished and ready items that shouldn't be here
 		foreach($value as $p) {
+			$p->of(true); // ensure RepeaterPage items also formatted
 			$cnt++;
 			if($p->isHidden() || $p->isUnpublished() || ($maxItems && $cnt > $maxItems)) {
 				if(is_null($formatted)) $formatted = clone $value;
@@ -1380,6 +1381,10 @@ class FieldtypeRepeater extends Fieldtype implements ConfigurableModule, Fieldty
 				$cnt--;
 			}
 		}
+		
+		if($formatted) {
+			foreach($formatted as $p) $p->of(true);
+		}
 
 		return is_null($formatted) ? $value : $formatted;
 	}
diff --git a/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPage.php b/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPage.php
index ed94e64b..1c084b52 100644
--- a/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPage.php
+++ b/wire/modules/Fieldtype/FieldtypeRepeater/RepeaterPage.php
@@ -78,10 +78,10 @@ class RepeaterPage extends Page {
 		if(strpos($parentName, $prefix) === 0) {
 			// determine owner page from parent name in format: for-page-1234
 			$forID = (int) substr($parentName, strlen($prefix));
-			$this->forPage = $this->wire('pages')->get($forID); 
+			$this->forPage = $this->wire()->pages->get($forID); 
 		} else {
 			// this probably can't occur, but here just in case
-			$this->forPage = $this->wire('pages')->newNullPage();
+			$this->forPage = $this->wire()->pages->newNullPage();
 		}
 
 		return $this->forPage;
@@ -284,4 +284,3 @@ class RepeaterPage extends Page {
 		return $p->id ? $p->getAccessTemplate($type) : parent::getAccessTemplate($type);
 	}
 }
-