pkp/pkp-lib#5122 Use Countable interface in DAOResultIterator

ajnyga · Nov 17, 2019 · 3a56b22 · 3a56b22
1 parent 99faff6
commit 3a56b22
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/classes/components/forms/site/SiteConfigForm.inc.php b/classes/components/forms/site/SiteConfigForm.inc.php
@@ -46,7 +46,7 @@ public function __construct($action, $locales, $site) {
 			'value' => $site->getData('title'),
 		]));
 
-		if ($result->valid()) {
+		if (count($result)) {
 			$options = [['value' => '', 'label' => '']];
 			foreach ($result as $context) {
 				$options[] = [

diff --git a/pages/article/ArticleHandler.inc.php b/pages/article/ArticleHandler.inc.php
@@ -67,7 +67,7 @@ function initialize($request, $args = array()) {
 			'publisherIds' => $urlPath,
 		]);
 		$publicationWithMatchingUrl = null;
-		if ($result->valid()) {
+		if (count($result)) {
 			$publicationWithMatchingUrl = $result->current();
 			$submissionId = $publicationWithMatchingUrl->getData('submissionId');
 		} elseif (ctype_digit($urlPath)) {