feat: use wfAppendQuery to apply query to URL instead of sprintf

This is a safer method and also avoid the issue where the URL has conflicting question mark
StarCitizenWiki · Jul 12, 2024 · f84c125 · f84c125
1 parent 3a3a62a
commit f84c125
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/includes/EmbedService/AbstractEmbedService.php b/includes/EmbedService/AbstractEmbedService.php
@@ -261,7 +261,7 @@ protected function getIdRegex(): array {
 	 */
 	public function getUrl(): string {
 		if ( $this->getUrlArgs() !== false ) {
-			return sprintf( '%s?%s', sprintf( $this->getBaseUrl(), $this->getId() ), $this->getUrlArgs() );
+			return wfAppendQuery( sprintf( $this->getBaseUrl(), $this->getId() ), $this->getUrlArgs() );
 		}
 
 		return sprintf( $this->getBaseUrl(), $this->getId() );

diff --git a/includes/EmbedService/Bandcamp.php b/includes/EmbedService/Bandcamp.php
@@ -40,7 +40,7 @@ public function getUrl(): string {
 			unset( $this->urlArgs['autoplay'] );
 
 			$args = array_shift( $this->urlArgs );
-			return sprintf( '%s&%s', sprintf( $this->getBaseUrl(), $this->getId() ), $args ?? '' );
+			return wfAppendQuery( sprintf( $this->getBaseUrl(), $this->getId() ), $args ?? '' );
 		}
 
 		return parent::getUrl();

diff --git a/includes/EmbedService/Bilibili.php b/includes/EmbedService/Bilibili.php
@@ -53,7 +53,7 @@ public function getCSPUrls(): array {
 	 */
 	public function getUrl(): string {
 		if ( $this->getUrlArgs() !== false ) {
-			return sprintf( '%s&%s', sprintf( $this->getBaseUrl(), $this->getId() ), $this->getUrlArgs() );
+			return wfAppendQuery( sprintf( $this->getBaseUrl(), $this->getId() ), $this->getUrlArgs() );
 		}
 
 		return sprintf( $this->getBaseUrl(), $this->getId() );

diff --git a/includes/EmbedService/Twitch/Twitch.php b/includes/EmbedService/Twitch/Twitch.php
@@ -73,7 +73,7 @@ public function getUrl(): string {
 			$urlArgs = http_build_query( $parsedArgs );
 		}
 
-		return sprintf( '%s&%s', sprintf( $this->getBaseUrl(), $this->getId() ), $urlArgs );
+		return wfAppendQuery( sprintf( $this->getBaseUrl(), $this->getId() ), $urlArgs );
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -73,7 +73,7 @@ public function getUrl(): string { @@
     			$urlArgs = http_build_query( $parsedArgs );
     		}
-    		return sprintf( '%s&%s', sprintf( $this->getBaseUrl(), $this->getId() ), $urlArgs );
+    		return wfAppendQuery( sprintf( $this->getBaseUrl(), $this->getId() ), $urlArgs );
     	}
     	/**
@@ Expand Down @@