From e7626787a654ca8dba24d234396f9c632134ba1e Mon Sep 17 00:00:00 2001
From: EclipseMarketingUk
 <77388613+EclipseMarketingUk@users.noreply.github.com>
Date: Fri, 29 Jan 2021 16:30:25 +0000
Subject: [PATCH 1/4] Update Model.php

---
 lib/Model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Model.php b/lib/Model.php
index 99667b41f..296cd1c80 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -1667,7 +1667,7 @@ public static function find_by_pk($values, $options)
 		}
 		$results = count($list);
 
-		if ($results != ($expected = count($values)))
+		if ($results != ($expected = @count($values)))
 		{
 			$class = get_called_class();
 			if (is_array($values))

From 15b45d9cc5648d5afe922fbc9e79c89720cc1c60 Mon Sep 17 00:00:00 2001
From: EclipseMarketingUk
 <77388613+EclipseMarketingUk@users.noreply.github.com>
Date: Mon, 7 Jun 2021 17:13:03 +0100
Subject: [PATCH 2/4] Update Model.php

---
 lib/Model.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/Model.php b/lib/Model.php
index 296cd1c80..f3aa6fc0e 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -1667,7 +1667,13 @@ public static function find_by_pk($values, $options)
 		}
 		$results = count($list);
 
-		if ($results != ($expected = @count($values)))
+		if ( is_array($values) ){
+			$expected = count($values);
+		} else {
+			$expected = 1;
+			$values = array( $values );
+		}
+		if ($results != $expected)
 		{
 			$class = get_called_class();
 			if (is_array($values))

From ec009eedf75dba487dcead1afe3905e434b7f21b Mon Sep 17 00:00:00 2001
From: EclipseMarketingUk
 <77388613+EclipseMarketingUk@users.noreply.github.com>
Date: Thu, 2 Sep 2021 15:19:12 +0100
Subject: [PATCH 3/4] Update Model.php

fix for count() error
---
 lib/Model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Model.php b/lib/Model.php
index f3aa6fc0e..1e4ae51c1 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -1666,6 +1666,9 @@ public static function find_by_pk($values, $options)
 			$list = $table->find($options);
 		}
 		$results = count($list);
+		if ( !is_array( $values ) ) {
+			$values = array( $values );
+		}
 
 		if ( is_array($values) ){
 			$expected = count($values);

From a1846a99b90cb18c822d2cb51bc3393ec89e147b Mon Sep 17 00:00:00 2001
From: EclipseMarketingUk
 <77388613+EclipseMarketingUk@users.noreply.github.com>
Date: Wed, 22 Sep 2021 16:45:04 +0100
Subject: [PATCH 4/4] Update ActiveRecord.php

---
 ActiveRecord.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ActiveRecord.php b/ActiveRecord.php
index 084587547..14b244154 100644
--- a/ActiveRecord.php
+++ b/ActiveRecord.php
@@ -40,11 +40,11 @@ function activerecord_autoload($class_name)
 		foreach ($namespaces as $directory)
 			$directories[] = $directory;
 
-		$root .= DIRECTORY_SEPARATOR . implode($directories, DIRECTORY_SEPARATOR);
+		$root .= DIRECTORY_SEPARATOR . implode(DIRECTORY_SEPARATOR, $directories);
 	}
 
 	$file = "$root/$class_name.php";
 
 	if (file_exists($file))
 		require_once $file;
-}
\ No newline at end of file
+}