Move headers out of getJson functions

BrandonXLF · Sep 20, 2023 · 85a59e0 · 85a59e0
1 parent 236410c
commit 85a59e0
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 9 deletions.
diff --git a/api/index.php b/api/index.php
@@ -3,7 +3,10 @@
 require '../vendor/autoload.php';
 
 if ($_SERVER['QUERY_STRING']) {
+	header('Content-Type: application/json');
+	header('Access-Control-Allow-Origin: *');
 	echo (new LinkCount(get('page'), get('project'), get('namespaces')))->getJson();
+
 	exit;
 }
 

diff --git a/includes/LinkCount.php b/includes/LinkCount.php
@@ -233,11 +233,6 @@ public function getHtml() {
 	}
 
 	public function getJson() {
-		if (!headers_sent()) {
-			header('Content-Type: application/json');
-			header('Access-Control-Allow-Origin: *');
-		}
-
 		if (isset($this->error)) {
 			return json_encode(['error' => $this->error]);
 		}

diff --git a/includes/ProjectPrefixSearch.php b/includes/ProjectPrefixSearch.php
@@ -28,10 +28,6 @@ public function __construct($prefix) {
 	}
 
 	public function getJson() {
-		if (!headers_sent()) {
-			header('Content-Type: application/json');
-		}
-
 		return json_encode([
 			'projects' => $this->projects,
 			'exact' => $this->exact

diff --git a/projects/index.php b/projects/index.php
@@ -2,4 +2,5 @@
 
 require '../vendor/autoload.php';
 
+header('Content-Type: application/json');
 echo (new ProjectPrefixSearch(get('prefix')))->getJson();
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,5 @@

		require '../vendor/autoload.php';

		header('Content-Type: application/json');
		echo (new ProjectPrefixSearch(get('prefix')))->getJson();