summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--system/database/DB_query_builder.php6
-rw-r--r--system/libraries/Xmlrpc.php2
-rw-r--r--system/libraries/Xmlrpcs.php4
-rw-r--r--tests/codeigniter/core/Security_test.php6
-rw-r--r--user_guide_src/source/tutorial/news_section.rst2
5 files changed, 10 insertions, 10 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');
diff --git a/tests/codeigniter/core/Security_test.php b/tests/codeigniter/core/Security_test.php
index 5132e5887..4d76f4265 100644
--- a/tests/codeigniter/core/Security_test.php
+++ b/tests/codeigniter/core/Security_test.php
@@ -253,9 +253,9 @@ class Security_test extends CI_TestCase {
// Perform hash
$this->security->xss_hash();
- $assertRegExp = class_exists('PHPUnit_Runner_Version')
- ? 'assertRegExp'
- : 'assertMatchesRegularExpression';
+ $assertRegExp = method_exists($this, 'assertMatchesRegularExpression')
+ ? 'assertMatchesRegularExpression'
+ : 'assertRegExp';
$this->$assertRegExp('#^[0-9a-f]{32}$#iS', $this->security->xss_hash);
}
diff --git a/user_guide_src/source/tutorial/news_section.rst b/user_guide_src/source/tutorial/news_section.rst
index 286d620dc..0953b8e72 100644
--- a/user_guide_src/source/tutorial/news_section.rst
+++ b/user_guide_src/source/tutorial/news_section.rst
@@ -116,7 +116,7 @@ so it can be used in all other methods in this controller.
It also loads a collection of :doc:`URL Helper <../helpers/url_helper>`
functions, because we'll use one of them in a view later.
-Next, there are two methods to view all news items and one for a specific
+Next, there are two methods to view news items: one for all news items and one for a specific
news item. You can see that the ``$slug`` variable is passed to the model's
method in the second method. The model is using this slug to identify the
news item to be returned.