Add nullpage check

solonmedia · Jan 23, 2024 · 3ed5e4f · 3ed5e4f
1 parent c99a189
commit 3ed5e4f
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/FieldtypeGrapick.module.php b/FieldtypeGrapick.module.php
@@ -42,23 +42,27 @@ public function __construct() {
 	 * 
 	 * @param Page $page
 	 * @param Field $field
-	 * @return InputfieldCssGradient
+	 * @return CssGradient
 	 *
 	 */
 	public function getInputfield(Page $page, Field $field) {
-		/** @var InputfieldCssGradient $inputfield */
+		/** @var InputfieldGrapick $inputfield */
 
 		$inputfield = $this->wire('modules')->get('InputfieldGrapick');
 
-		if($page->template->pageClass == 'RepeaterMatrixPage') {
-			if($page->getField($field->name)) {
-				$field_in_context = $page->fieldgroup->getFieldContext($field, "matrix$page->repeater_matrix_type");
-				if($field_in_context) {
-					$field = $field_in_context;
+		$context = ($page && $page->id) ? $field->getContext($page->template) : $field;
+
+		if(!($page instanceof NullPage)) {
+			if($page->template->pageClass == 'RepeaterMatrixPage') {
+				if($page->getField($field->name)) {
+					$field_in_context = $page->fieldgroup->getFieldContext($field, "matrix$page->repeater_matrix_type");
+					if($field_in_context) {
+						$field = $field_in_context;
+					}
 				}
+				$inputfield->setField($field);
+				$inputfield->setPage($page);
 			}
-		$inputfield->setField($field);
-		$inputfield->setPage($page);
 		}
 
 		return $inputfield;
@@ -105,11 +109,19 @@ public function getBlankValue(Page $page, Field $field) {
 
 		$context = ($page && $page->id) ? $field->getContext($page->template) : $field;
 
-		if($page->template->pageClass == 'RepeaterMatrixPage') {
-    		if($page->getField($field->name)) {
-    			$context = $page->fieldgroup->getFieldContext($field, "matrix$page->repeater_matrix_type");
+		if(!($page instanceof NullPage)) {
+			if($page->template->pageClass == 'RepeaterMatrixPage') {
+				if($page->getField($field->name)) {
+					$field_in_context = $page->fieldgroup->getFieldContext($field, "matrix$page->repeater_matrix_type");
+					if($field_in_context) {
+						$field = $field_in_context;
+					}
+				}
+				$inputfield->setField($field);
+				$inputfield->setPage($page);
 			}
-    	}
+		}
+
 		$gradient = new CssGradient(); //Context for this object isn't important because there is no config.
 
 		return $gradient;