From 8d80bef64b79f6cddc1e631760d862c563b525bf Mon Sep 17 00:00:00 2001
From: László Bóra <boralaszlo@gmail.com>
Date: Sun, 24 Jul 2022 14:48:31 +0200
Subject: fixes #6149 remove deprecated variable variables / string
 interpolation in variable names

---
 system/database/DB_query_builder.php | 6 +++---
 system/libraries/Xmlrpc.php          | 2 +-
 system/libraries/Xmlrpcs.php         | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/system/database/DB_query_builder.php b/system/database/DB_query_builder.php
index e57333ff9..de6aa04fc 100644
--- a/system/database/DB_query_builder.php
+++ b/system/database/DB_query_builder.php
@@ -692,11 +692,11 @@ abstract class CI_DB_query_builder extends CI_DB_driver {
 				$k = substr($k, 0, $match[0][1]).($match[1][0] === '=' ? ' IS NULL' : ' IS NOT NULL');
 			}
 
-			${$qb_key} = array('condition' => $prefix.$k, 'value' => $v, 'escape' => $escape);
-			$this->{$qb_key}[] = ${$qb_key};
+			$$qb_key = array('condition' => $prefix.$k, 'value' => $v, 'escape' => $escape);
+			$this->{$qb_key}[] = $$qb_key;
 			if ($this->qb_caching === TRUE)
 			{
-				$this->{$qb_cache_key}[] = ${$qb_key};
+				$this->{$qb_cache_key}[] = $$qb_key;
 				$this->qb_cache_exists[] = substr($qb_key, 3);
 			}
 
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 876232c5c..8587015e8 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1719,7 +1719,7 @@ class XML_RPC_Values extends CI_Xmlrpc
 
 		if ($typeof != 1)
 		{
-			echo '<strong>XML_RPC_Values</strong>: not a scalar type (${typeof})<br />';
+			echo "<strong>XML_RPC_Values</strong>: not a scalar type ($typeof)<br />";
 			return 0;
 		}
 
diff --git a/system/libraries/Xmlrpcs.php b/system/libraries/Xmlrpcs.php
index b91d3fcb3..eb5a24c49 100644
--- a/system/libraries/Xmlrpcs.php
+++ b/system/libraries/Xmlrpcs.php
@@ -551,8 +551,8 @@ class CI_Xmlrpcs extends CI_Xmlrpc {
 	 */
 	public function multicall_error($err)
 	{
-		$str = is_string($err) ? $this->xmlrpcstr["multicall_${err}"] : $err->faultString();
-		$code = is_string($err) ? $this->xmlrpcerr["multicall_${err}"] : $err->faultCode();
+		$str = is_string($err) ? $this->xmlrpcstr["multicall_$err"] : $err->faultString();
+		$code = is_string($err) ? $this->xmlrpcerr["multicall_$err"] : $err->faultCode();
 
 		$struct['faultCode'] = new XML_RPC_Values($code, 'int');
 		$struct['faultString'] = new XML_RPC_Values($str, 'string');
-- 
cgit v1.2.3-24-g4f1b