V7_7_links (#944)

Author: timotei-litespeed

src/css.cls.php

@@ -135,10 +135,14 @@ private function _gen_ccss_file_tag( $request_url ) {
 	 */
 	private function _ccss() {
 		global $wp;
-		$request_url = get_permalink();
-		// Backup, in case get_permalink() fails.
-		if ( ! $request_url ) {
-			$request_url = home_url( $wp->request );
+
+		// get current request url
+		$permalink_structure = get_option( 'permalink_structure' );
+		if ( ! empty( $permalink_structure ) ) {
+			$request_url = trailingslashit( home_url( $wp->request ) );
+		} else {
+			$qs_add      = $wp->query_string ? '?' . (string) $wp->query_string : '' ;
+			$request_url = home_url( $wp->request ) . $qs_add;
 		}
 
 		$filepath_prefix = $this->_build_filepath_prefix( 'ccss' );

src/optimize.cls.php

@@ -274,10 +274,14 @@ private function _finalize( $content ) {
 	 */
 	private function _optimize() {
 		global $wp;
-		$this->_request_url = get_permalink();
-		// Backup, in case get_permalink() fails.
-		if (!$this->_request_url) {
-			$this->_request_url = home_url($wp->request);
+		
+		// get current request url
+		$permalink_structure = get_option( 'permalink_structure' );
+		if ( ! empty( $permalink_structure ) ) {
+			$this->_request_url = trailingslashit( home_url( $wp->request ) );
+		} else {
+			$qs_add             = $wp->query_string ? '?' . (string) $wp->query_string : '' ;
+			$this->_request_url = home_url( $wp->request ) . $qs_add;
 		}
 
 		$this->cfg_css_min            = defined('LITESPEED_GUEST_OPTM') || $this->conf(self::O_OPTM_CSS_MIN);

src/purge.cls.php

@@ -331,7 +331,11 @@ public static function purge_ucss( $post_id_or_url ) {
 			$post_id_or_url = get_permalink( (int) $post_id_or_url );
 		}
 
-		$post_id_or_url = untrailingslashit( (string) $post_id_or_url );
+		$post_id_or_url      = (string) $post_id_or_url;
+		$permalink_structure = get_option( 'permalink_structure' );
+		if ( ! empty( $permalink_structure ) ) {
+			$post_id_or_url = trailingslashit( (string) $post_id_or_url );
+		}
 
 		$existing_url_files = Data::cls()->mark_as_expired( $post_id_or_url, true );
 		if ( $existing_url_files ) {