summaryrefslogtreecommitdiffstats
path: root/system/plugins
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2008-05-13 06:23:20 +0200
committerDerek Jones <derek.jones@ellislab.com>2008-05-13 06:23:20 +0200
commit1b7ef4f19a903b4aedd16a2863e882802962752d (patch)
treedb81cc41d125b37c870c7639216e8d45b43a1024 /system/plugins
parent0b59f270a432f8c7b6128981f0a39b4a2e2fbd34 (diff)
reverted OR back to || for js_calendar_pi.php javascript
Diffstat (limited to 'system/plugins')
-rw-r--r--system/plugins/js_calendar_pi.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/system/plugins/js_calendar_pi.php b/system/plugins/js_calendar_pi.php
index 964d50315..d75b77371 100644
--- a/system/plugins/js_calendar_pi.php
+++ b/system/plugins/js_calendar_pi.php
@@ -274,7 +274,7 @@ function total_days()
case 1: // Check for leap year
if (( this.date_obj.getFullYear() % 4 == 0
&& this.date_obj.getFullYear() % 100 != 0)
- OR this.date_obj.getFullYear() % 400 == 0)
+ || this.date_obj.getFullYear() % 400 == 0)
return 29;
else
return 28;
@@ -385,9 +385,9 @@ function update_calendar(id, dateValue)
var newMonth = dateParts[1];
var newDay = dateParts[2];
- if (isNaN(newDay) OR newDay < 1 OR (newDay.length != 1 && newDay.length != 2)) return;
- if (isNaN(newYear) OR newYear < 1 OR newYear.length != 4) return;
- if (isNaN(newMonth) OR newMonth < 1 OR (newMonth.length != 1 && newMonth.length != 2)) return;
+ if (isNaN(newDay) || newDay < 1 || (newDay.length != 1 && newDay.length != 2)) return;
+ if (isNaN(newYear) || newYear < 1 || newYear.length != 4) return;
+ if (isNaN(newMonth) || newMonth < 1 || (newMonth.length != 1 && newMonth.length != 2)) return;
if (newMonth > 12) newMonth = 12;
@@ -396,7 +396,7 @@ function update_calendar(id, dateValue)
switch(newMonth - 1)
{
case 1: // Check for leap year
- if ((newYear % 4 == 0 && newYear % 100 != 0) OR newYear % 400 == 0)
+ if ((newYear % 4 == 0 && newYear % 100 != 0) || newYear % 400 == 0)
{
if (newDay > 29) newDay = 29;
}
@@ -541,7 +541,7 @@ function change_month(mo, cal)
switch(newMonth)
{
case 1: // Check for leap year
- if ((newYear % 4 == 0 && newYear % 100 != 0) OR newYear % 400 == 0)
+ if ((newYear % 4 == 0 && newYear % 100 != 0) || newYear % 400 == 0)
{
if (newDate > 29) newDate = 29;
}