summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorRoger Herbert <rogerlherbert@gmail.com>2012-03-11 17:15:15 +0100
committerRoger Herbert <rogerlherbert@gmail.com>2012-03-11 17:15:15 +0100
commitb8fb66b38e233c82f0116f9bdb0fdfd4ee074b30 (patch)
tree4b24c69bcd40ada38d663353b7c3598dbdbedec1 /system
parent04c146d95dbc1c86e477bd27798d3234f74833e0 (diff)
AND -> &&
Diffstat (limited to 'system')
-rw-r--r--system/helpers/date_helper.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/system/helpers/date_helper.php b/system/helpers/date_helper.php
index 70b01e348..e792ecc43 100644
--- a/system/helpers/date_helper.php
+++ b/system/helpers/date_helper.php
@@ -196,7 +196,7 @@ if ( ! function_exists('timespan'))
$seconds -= $years * 31557600;
$months = floor($seconds / 2629743);
- if (count($str) < $units AND ($years > 0 OR $months > 0))
+ if (count($str) < $units && ($years > 0 OR $months > 0))
{
if ($months > 0)
{
@@ -208,7 +208,7 @@ if ( ! function_exists('timespan'))
$weeks = floor($seconds / 604800);
- if (count($str) < $units AND ($years > 0 OR $months > 0 OR $weeks > 0))
+ if (count($str) < $units && ($years > 0 OR $months > 0 OR $weeks > 0))
{
if ($weeks > 0)
{
@@ -220,7 +220,7 @@ if ( ! function_exists('timespan'))
$days = floor($seconds / 86400);
- if (count($str) < $units AND ($months > 0 OR $weeks > 0 OR $days > 0))
+ if (count($str) < $units && ($months > 0 OR $weeks > 0 OR $days > 0))
{
if ($days > 0)
{
@@ -232,7 +232,7 @@ if ( ! function_exists('timespan'))
$hours = floor($seconds / 3600);
- if (count($str) < $units AND ($days > 0 OR $hours > 0))
+ if (count($str) < $units && ($days > 0 OR $hours > 0))
{
if ($hours > 0)
{
@@ -244,7 +244,7 @@ if ( ! function_exists('timespan'))
$minutes = floor($seconds / 60);
- if (count($str) < $units AND ($days > 0 OR $hours > 0 OR $minutes > 0))
+ if (count($str) < $units && ($days > 0 OR $hours > 0 OR $minutes > 0))
{
if ($minutes > 0)
{