adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 11:28:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

converting if ($foo != "") to if ($foo)

Browse source
This commit is contained in:
dogmatic69 2012-09-21 23:34:37 +01:00
parent 8dc4de5de8
commit 36314e6d37
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Cake/Model/Datasource/CakeSession.php
View file

@ -663,7 +663,7 @@ class CakeSession {
*/ */
public static function renew() { public static function renew() {
if (session_id()) { if (session_id()) {
if (session_id() != '' || isset($_COOKIE[session_name()])) { if (session_id() || isset($_COOKIE[session_name()])) {
setcookie(Configure::read('Session.cookie'), '', time() - 42000, self::$path); setcookie(Configure::read('Session.cookie'), '', time() - 42000, self::$path);
} }
session_regenerate_id(true); session_regenerate_id(true);

2
lib/Cake/View/Helper.php
View file

@ -749,7 +749,7 @@ class Helper extends Object {
* @return array Array of options with $key set. * @return array Array of options with $key set.
*/ */
public function addClass($options = array(), $class = null, $key = 'class') { public function addClass($options = array(), $class = null, $key = 'class') {
if (isset($options[$key]) && trim($options[$key]) != '') { if (isset($options[$key]) && trim($options[$key])) {
$options[$key] .= ' ' . $class; $options[$key] .= ' ' . $class;
} else { } else {
$options[$key] = $class; $options[$key] = $class;

2
lib/Cake/View/Helper/CacheHelper.php
View file

@ -148,7 +148,7 @@ class CacheHelper extends AppHelper {
$cacheTime = $cacheAction; $cacheTime = $cacheAction;
} }
if ($cacheTime != '' && $cacheTime > 0) { if ($cacheTime && $cacheTime > 0) {
$cached = $this->_parseOutput($out); $cached = $this->_parseOutput($out);
try { try {
$this->_writeFile($cached, $cacheTime, $useCallbacks); $this->_writeFile($cached, $cacheTime, $useCallbacks);