[Git][codeigniterpower/codeigniterpower][master] Fixes bcit-ci#6175

[Герхард PICCORO Lenz McKAY (@mckaygerhard)]

Герхард PICCORO Lenz McKAY pushed to branch master at codeigniterpower / codeigniterpower

Commits:

• ad1a3075
  by mckaygerhard at 2024-02-05T09:01:46-04:00

  Fixes bcit-ci#6175
  
  * fix $this->uri->ruri_string() generates error message in PHP 8.1
    but implements in different way due conflict with orign
    commit https://github.com/bcit-ci/CodeIgniter/commit/2ef5ed458c611331facfeb5abee051f4c0d1b08e
  * already solved again https://github.com/bcit-ci/CodeIgniter/issues/3752
  

1 changed file:

• appsys/core/Router.php

Changes:

• appsys/core/Router.php

  ---

  ...	...	@@ -84,7 +84,7 @@ class CI_Router {
  84	84	*
  85	85	* @var string
  86	86	*/
  87		- public $directory;
  	87	+ public $directory == NULL;
  88	88
  89	89	/**
  90	90	* Default controller (and method if specific)
  ...	...	@@ -333,7 +333,7 @@ class CI_Router {
  333	333	protected function _validate_request($segments)
  334	334	{
  335	335	$c = count($segments);
  336		- $directory_override = isset($this->directory);
  	336	+ $directory_override = ($this->directory !== NULL);
  337	337
  338	338	// Loop through our segments and return as soon as a controller
  339	339	// is found or when such a directory doesn't exist

  
  

—
View it on GitLab.
You're receiving this email because of your account on gitlab.com. Manage all notifications · Help