From 164d132be856bf05c48a72c8b137e89f21ebc12f Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Wed, 28 Mar 2018 05:59:40 -0400 Subject: [PATCH] Fix issue processwire/processwire-issues#548 WireLog::getLines method wasn't passing options array to FileLog::find --- wire/core/WireLog.php | 5 ++++- wire/modules/AdminTheme/AdminThemeUikit/init.php | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/wire/core/WireLog.php b/wire/core/WireLog.php index dc39d711..f7ac6909 100644 --- a/wire/core/WireLog.php +++ b/wire/core/WireLog.php @@ -12,6 +12,9 @@ * https://processwire.com * * @method bool save($name, $text, $options = array()) + * + * @todo option to avoid saving same log entry text back-to-back + * @todo option to disable logs by name * */ @@ -246,7 +249,7 @@ class WireLog extends Wire { unset($options['pageNum']); $log = $this->getFileLog($name); $limit = isset($options['limit']) ? (int) $options['limit'] : 100; - return $log->find($limit, $pageNum); + return $log->find($limit, $pageNum, $options); } /** diff --git a/wire/modules/AdminTheme/AdminThemeUikit/init.php b/wire/modules/AdminTheme/AdminThemeUikit/init.php index 66fcc304..38b9706c 100644 --- a/wire/modules/AdminTheme/AdminThemeUikit/init.php +++ b/wire/modules/AdminTheme/AdminThemeUikit/init.php @@ -30,7 +30,7 @@ $ukGridWidths = array( '40%' => '2-5', '34%' => '1-3', '33%' => '1-3', - '32%' => '2-6', + '32%' => '1-3', '30%' => '1-3', '25%' => '1-4', '20%' => '1-5',