php 8.* deprecation fixes

NielBuys · Jul 11, 2023 · cc7e70f · cc7e70f
1 parent 8bc0e71
commit cc7e70f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/system/core/Common.php b/system/core/Common.php
@@ -723,7 +723,7 @@ function remove_invisible_characters($str, $url_encoded = TRUE)
 
 		do
 		{
-			$str = preg_replace($non_displayables, '', $str, -1, $count);
+			$str = preg_replace($non_displayables, '', $str??'', -1, $count);
 		}
 		while ($count);
 

diff --git a/system/core/URI.php b/system/core/URI.php
@@ -645,7 +645,7 @@ public function uri_string()
 	 */
 	public function ruri_string()
 	{
-		return ltrim(load_class('Router', 'core')->directory, '/').implode('/', $this->rsegments);
+		return ltrim((string) load_class('Router', 'core')->directory, '/').implode('/', $this->rsegments);
 	}
 
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		do
     		{
-    			$str = preg_replace($non_displayables, '', $str, -1, $count);
+    			$str = preg_replace($non_displayables, '', $str??'', -1, $count);
     		}
     		while ($count);
@@ Expand Down @@