From 83846d1fe23d6d1b39ee59310c694aabb608081e Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Wed, 14 Dec 2016 12:26:26 -0500 Subject: [PATCH] Minor tweaks --- wire/core/Pages.php | 3 ++- wire/core/PagesLoader.php | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/wire/core/Pages.php b/wire/core/Pages.php index b677d304..cba3b829 100644 --- a/wire/core/Pages.php +++ b/wire/core/Pages.php @@ -291,8 +291,9 @@ class Pages extends Wire { $debug = $this->debug; if($debug) $this->debug(false); $options['lazy'] = true; + $options['caller'] = 'pages.findMany'; if(!isset($options['cache'])) $options['cache'] = false; - $matches = $this->loader->find($selector, $options); + $matches = $this->find($selector, $options); if($debug) $this->debug($debug); return $matches; } diff --git a/wire/core/PagesLoader.php b/wire/core/PagesLoader.php index e3724f37..2aa89cb1 100644 --- a/wire/core/PagesLoader.php +++ b/wire/core/PagesLoader.php @@ -244,11 +244,13 @@ class PagesLoader extends Wire { $pages->finderOptions($options); $pages->setDuplicateChecking(false); $loadPages = false; + $cachePages = false; $template = null; foreach($pagesIDs as $id) { $page = $this->pages->newPage(); $page->_lazy($id); + $page->loaderCache = false; $pages->add($page); } @@ -661,6 +663,7 @@ class PagesLoader extends Wire { } unset($row['templates_id']); foreach($row as $key => $value) $page->set($key, $value); + if($options['cache'] === false) $page->loaderCache = false; $page->instanceID = ++$instanceID; $page->setIsLoaded(true); $page->setIsNew(false);