diff --git a/core/util.inc.php b/core/util.inc.php
index 40a0a397..8dbe4b7f 100644
--- a/core/util.inc.php
+++ b/core/util.inc.php
@@ -1724,12 +1724,7 @@ function _get_user() {
 }
 
 function _get_query() {
-	if(php_sapi_name() == 'cli-server') {
-		return $_SERVER["REQUEST_URI"];
-	}
-	else {
-		return @$_POST["q"]?:@$_GET["q"];
-	}
+	return @$_POST["q"]?:@$_GET["q"];
 }