switched over to using fatfree-core directly

mateowatson · Feb 12, 2024 · d185a8c · d185a8c
1 parent 62801f5
commit d185a8c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 36 deletions.
diff --git a/protected/composer.json b/protected/composer.json
@@ -1,5 +1,5 @@
 {
-	"require": {
-		"bcosca/fatfree": "^3.8"
-	}
+    "require": {
+        "bcosca/fatfree-core": "^3.8"
+    }
 }
diff --git a/protected/composer.lock b/protected/composer.lock
diff --git a/protected/src/Bootstrap.php b/protected/src/Bootstrap.php
@@ -109,7 +109,7 @@ function($session){
 );
 
 // Capture errors in memory
-$f3->set('v_errors', json_decode($f3->get('SESSION.errors')) ? : array());
+$f3->set('v_errors', $f3->get('SESSION.errors') ? json_decode($f3->get('SESSION.errors')) : array());
 // Creating v_errors_element_ids, simply for ease of checking quickly if there are any
 // errors, especially for use in the template files.
 $f3->set('v_errors_element_ids', array());
@@ -119,7 +119,7 @@ function($session){
 }
 $f3->set('v_errors_element_ids', array_unique($element_ids));
 // Capture confirmations in memory
-$f3->set('v_confirmations', json_decode($f3->get('SESSION.confirmations')) ? : array());
+$f3->set('v_confirmations', $f3->get('SESSION.confirmations') ? json_decode($f3->get('SESSION.confirmations')) : array());
 // Creating v_confirmations_element_ids, simply for ease of checking quickly if there are any
 // confirmations, especially for use in the template files.
 $element_ids = array();