Handle empty google fonts field better

Signed-off-by: Matt Friedman <[email protected]>
iMattPro · Nov 7, 2024 · da571d0 · da571d0
1 parent 2b3307a
commit da571d0
Showing 1 changed file with 13 additions and 3 deletions.
diff --git a/controller/acp_controller.php b/controller/acp_controller.php
@@ -189,9 +189,19 @@ protected function get_google_fonts()
 	protected function save_google_fonts()
 	{
 		$fonts = $this->request->variable('abbc3_google_fonts', '');
-		$fonts = explode("\n", $fonts);
-		$this->validate_google_fonts($fonts);
-		$this->config_text->set('abbc3_google_fonts', json_encode($fonts));
+		if (!empty($fonts))
+		{
+			$fonts = explode("\n", $fonts);
+			$fonts = array_filter($fonts, 'strlen'); // Remove empty strings
+
+			if (!empty($fonts))
+			{
+				$this->validate_google_fonts($fonts);
+			}
+		}
+
+		$fonts = (is_array($fonts) && !empty($fonts)) ? json_encode($fonts) : '';
+		$this->config_text->set('abbc3_google_fonts', $fonts);
 	}
 
 	/**