Add port in cases

benignware · Aug 12, 2019 · c662deb · c662deb
1 parent 1c20f89
commit c662deb
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 30 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "benignware/wp-kicks-app-pro",
-  "version": "0.1.0-beta.17",
+  "version": "0.1.0-beta.18",
   "type": "wordpress-theme",
   "license": "MIT",
   "description": "Wordpress Kickstarter Theme",

diff --git a/composer.lock b/composer.lock
diff --git a/lib/themalizer.php b/lib/themalizer.php
@@ -626,30 +626,30 @@ function get_theme_resources() {
     return $theme_resources;
   }
 
-	if (!is_admin()) {
-		$theme_resources = load_theme_resources();
-
-		if ($theme_resources) {
-			return $theme_resources;
-		}
-	}
+	// if (!is_admin()) {
+	// 	$theme_resources = load_theme_resources();
+	//
+	// 	if ($theme_resources) {
+	// 		return $theme_resources;
+	// 	}
+	// }
 
   $url = admin_url( 'admin-ajax.php' ) . '?action=theme_resources';
   $urlinfo = parse_url($url);
-
-  /*
-
+	//
   $host = $_SERVER['SERVER_ADDR'];
-
-  $url = $urlinfo['scheme'] . '://' . $host . $urlinfo['path'] . ($urlinfo['query'] ? '?' . $urlinfo['query'] : '');
-
-  echo $url;
-  echo '<br/>';
-  */
-
-  $host = $_SERVER['SERVER_NAME'];
-	// $host = $_SERVER['SERVER_ADDR'];
-  $url = $urlinfo['scheme'] . '://' . $host . $urlinfo['path'] . ($urlinfo['query'] ? '?' . $urlinfo['query'] : '');
+	$port = $_SERVER['SERVER_PORT'] && substr($_SERVER['SERVER_PORT'], 0, 1) !== '8' ? $_SERVER['SERVER_PORT'] : '';
+
+	//
+  $url = $urlinfo['scheme'] . '://' . $host . ($port ? ':' . $port : '') . $urlinfo['path'] . ($urlinfo['query'] ? '?' . $urlinfo['query'] : '');
+	//
+  // */
+	//
+  // $host = $_SERVER['SERVER_NAME'];
+	// $host = $_SERVER['SERVER_NAME'];
+	//
+	// // $host = $_SERVER['SERVER_ADDR'];
+  // $url = $urlinfo['scheme'] . '://' . $host . $urlinfo['path'] . ($urlinfo['query'] ? '?' . $urlinfo['query'] : '');
 
   if (function_exists('curl_init')) {
     $ch = curl_init();

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "wp-kicks-app-pro",
-  "version": "0.1.0-beta.17",
+  "version": "0.1.0-beta.18",
   "description": "Wordpress theme",
   "private": true,
   "main": "dist/main.js",

diff --git a/style.css b/style.css
@@ -4,7 +4,7 @@ Theme Name: Kicks App Pro
 Author: Rafael Nowrotek
 Author URI: http://benignware.com
 Description: Kickstarter Template
-Version: 0.1.0-beta.17
+Version: 0.1.0-beta.18
 */
 
 * {