Merge pull request #152 from p0lemic/allow-reload-sifo-urls

Allow force Urls singleton constructor
sifophp · Apr 24, 2023 · 1ca4dd7 · 1ca4dd7
2 parents 20ca350 + 435deab
commit 1ca4dd7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 vendor/
 composer.lock
+.idea
diff --git a/src/Sifo/Urls.php b/src/Sifo/Urls.php
@@ -120,7 +120,7 @@ static public function getInstance( $instance_name = null )
 		return self::$instance[$instance_name];
 	}
 
-	private function __construct( $instance_name )
+	private function __construct( $instance_name , $force = false)
 	{
 		$domains = Domains::getInstance( $instance_name );
 		$filter_server = FilterServer::getInstance();
@@ -187,7 +187,7 @@ private function __construct( $instance_name )
 		self::$path_parts = explode( self::$url_definition['context_separator'], self::$path );
 
 		// Default url.config for all languages.
-		self::$url_config = $this->url_instance_config = Config::getInstance( $instance_name )->getConfig( 'url' );
+		self::$url_config = $this->url_instance_config = Config::getInstance( $instance_name, $force )->getConfig( 'url' );
 	}
 
 	/**
@@ -283,7 +283,7 @@ public function reloadUrlConfig($instance_name = null)
             $instance_name = Bootstrap::$instance;
         }
 
-        self::$instance[$instance_name] = new Urls( $instance_name );
+        self::$instance[$instance_name] = new Urls( $instance_name, true );
     }
 
 	/**