summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--[-rwxr-xr-x]index.php0
-rw-r--r--system/core/Security.php1
-rw-r--r--system/database/DB_utility.php2
-rw-r--r--system/database/drivers/mysql/mysql_forge.php1
-rw-r--r--system/helpers/html_helper.php1
-rw-r--r--system/libraries/Cache/drivers/Cache_redis.php1
-rw-r--r--system/libraries/Session/Session_driver.php2
-rw-r--r--system/libraries/Session/drivers/Session_files_driver.php2
-rw-r--r--system/libraries/Xmlrpc.php2
9 files changed, 4 insertions, 8 deletions
diff --git a/index.php b/index.php
index 8b095a77a..8b095a77a 100755..100644
--- a/index.php
+++ b/index.php
diff --git a/system/core/Security.php b/system/core/Security.php
index aac308194..a25c27c54 100644
--- a/system/core/Security.php
+++ b/system/core/Security.php
@@ -656,7 +656,6 @@ class CI_Security {
return $output;
}
-
if (is_readable('/dev/urandom') && ($fp = fopen('/dev/urandom', 'rb')) !== FALSE)
{
// Try not to waste entropy ...
diff --git a/system/database/DB_utility.php b/system/database/DB_utility.php
index a1450f099..3557801fa 100644
--- a/system/database/DB_utility.php
+++ b/system/database/DB_utility.php
@@ -252,7 +252,7 @@ abstract class CI_DB_utility {
$line = array();
foreach ($row as $item)
{
- $line[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, $item).$enclosure;
+ $line[] = $enclosure.str_replace($enclosure, $enclosure.$enclosure, (string) $item).$enclosure;
}
$out .= implode($delim, $line).$newline;
}
diff --git a/system/database/drivers/mysql/mysql_forge.php b/system/database/drivers/mysql/mysql_forge.php
index e59366bed..85101bdd9 100644
--- a/system/database/drivers/mysql/mysql_forge.php
+++ b/system/database/drivers/mysql/mysql_forge.php
@@ -185,7 +185,6 @@ class CI_DB_mysql_forge extends CI_DB_forge {
$extra_clause = ' FIRST';
}
-
return $this->db->escape_identifiers($field['name'])
.(empty($field['new_name']) ? '' : ' '.$this->db->escape_identifiers($field['new_name']))
.' '.$field['type'].$field['length']
diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 531ae2251..715515199 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -133,7 +133,6 @@ if ( ! function_exists('_list'))
// Write the opening list tag
.'<'.$type._stringify_attributes($attributes).">\n";
-
// Cycle through the list elements. If an array is
// encountered we will recursively call _list()
diff --git a/system/libraries/Cache/drivers/Cache_redis.php b/system/libraries/Cache/drivers/Cache_redis.php
index e541237e3..466a891f7 100644
--- a/system/libraries/Cache/drivers/Cache_redis.php
+++ b/system/libraries/Cache/drivers/Cache_redis.php
@@ -69,7 +69,6 @@ class CI_Cache_redis extends CI_Driver
*/
protected $_redis;
-
/**
* del()/delete() method name depending on phpRedis version
*
diff --git a/system/libraries/Session/Session_driver.php b/system/libraries/Session/Session_driver.php
index b1b1b073e..ec4b76841 100644
--- a/system/libraries/Session/Session_driver.php
+++ b/system/libraries/Session/Session_driver.php
@@ -153,7 +153,7 @@ abstract class CI_Session_driver {
return setcookie(
$this->_config['cookie_name'],
- NULL,
+ '',
array(
'expires' => 1,
'path' => $this->_config['cookie_path'],
diff --git a/system/libraries/Session/drivers/Session_files_driver.php b/system/libraries/Session/drivers/Session_files_driver.php
index 4b7b9878b..c912fc71d 100644
--- a/system/libraries/Session/drivers/Session_files_driver.php
+++ b/system/libraries/Session/drivers/Session_files_driver.php
@@ -35,7 +35,7 @@
* @link https://codeigniter.com
* @since Version 3.0.0
* @filesource
-*/
+ */
defined('BASEPATH') OR exit('No direct script access allowed');
/**
diff --git a/system/libraries/Xmlrpc.php b/system/libraries/Xmlrpc.php
index 11d4400fe..ce39fceb2 100644
--- a/system/libraries/Xmlrpc.php
+++ b/system/libraries/Xmlrpc.php
@@ -1909,7 +1909,7 @@ class XML_RPC_Values extends CI_Xmlrpc
* @param int unix timestamp
* @param bool
* @return string
- */
+ */
public function iso8601_encode($time, $utc = FALSE)
{
return ($utc) ? date('Ymd\TH:i:s', $time) : gmdate('Ymd\TH:i:s', $time);