diff options
| author | Andrey Andreev <narf@devilix.net> | 2022-02-11 15:47:18 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2022-02-11 15:47:18 +0100 |
| commit | dc667a73564012acb5c28df248942be055deff45 (patch) | |
| tree | 67af708c2134f1a8906daded409be5534883d0e1 /system | |
| parent | cd81c1e6b206c2830fffb4c33d89cb61837f3253 (diff) | |
| parent | 444f7977a82c09a00db8a74e9472d80fd4f50487 (diff) | |
Merge branch '3.1-stable' into develop
Diffstat (limited to 'system')
| -rw-r--r-- | system/database/DB_utility.php | 2 | ||||
| -rw-r--r-- | system/libraries/Session/Session_driver.php | 2 |
2 files changed, 2 insertions, 2 deletions
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/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'], |