Merge pull request #1694 from causefx/v2-develop

V2 develop

api/classes/organizr.class.php

@@ -60,7 +60,7 @@ class Organizr
 	
 	// ===================================
 	// Organizr Version
-	public $version = '2.1.472';
+	public $version = '2.1.476';
 	// ===================================
 	// Quick php Version check
 	public $minimumPHP = '7.3';
@@ -1140,7 +1140,7 @@ class Organizr
 		}
 		foreach ($tabs as $id => $tab) {
 			$tabs[$id]['url'] = $this->userDefinedIdReplacementLink($tab['url'], $variables);
-			$tabs[$id]['url_local'] = $this->userDefinedIdReplacementLink($tab['url'], $variables);
+			$tabs[$id]['url_local'] = $this->userDefinedIdReplacementLink($tab['url_local'], $variables);
 		}
 		return $tabs;
 	}

api/functions/organizr-functions.php

@@ -499,7 +499,6 @@ trait OrganizrFunctions
 	
 	public function checkFrame($array, $url)
 	{
-		
 		if (array_key_exists("x-frame-options", $array)) {
 			if (gettype($array['x-frame-options']) == 'array') {
 				$array['x-frame-options'] = $array['x-frame-options'][0];

js/version.json

@@ -404,5 +404,12 @@
     "new": "Pass variables through with URLs (FR#203150)|qbittorent socks (FR#196698)|framework for copy json button to homepage items|debug json to all homepage items|updated ui - change settings ui from horizontal to vertical|ui for Save homepage settings modal|make tautulli custom names dynamic|only update tautulli custom names config item if it doesn't match|prevent organizrHash from being displayed via API",
     "fixed": "splashscreen scroll (#1692)|jellyin open tab (#1633)|test iframe|sonarr input box|plex invite with deleted library|catch error from socks api|clear ajax on reload|loop load config on load",
     "notes": "update Adldap2/Adldap2"
+  },
+  "2.1.476": {
+    "date": "2021-08-20 21:40",
+    "title": "Weekly Update - Patch",
+    "new": "",
+    "fixed": "Local URL being set as regual URL|Line spacing|updated Overseerr logo",
+    "notes": "See update notes for version 2.1.472"
   }
 }