php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #67960 - Long/short day names reversed in jddayofweek()

Browse Source
This commit is contained in:
Greg Roach
2014-09-04 22:29:26 +01:00
committed by Ferenc Kovacs
parent 99162b8198
commit 244fc1e053
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/calendar/calendar.c
+3 -3
View File
@@ -208,7 +208,7 @@ static struct cal_entry_t cal_conversion_table[CAL_NUM_CALS] = {
#define JEWISH_HEB_MONTH_NAME(year) ((monthsPerYear[((year)-1) % 19] == 13)?JewishMonthHebNameLeap:JewishMonthHebName)
/* For jddayofweek */
enum { CAL_DOW_DAYNO, CAL_DOW_SHORT, CAL_DOW_LONG };
enum { CAL_DOW_DAYNO, CAL_DOW_LONG, CAL_DOW_SHORT };
/* For jdmonthname */
enum { CAL_MONTH_GREGORIAN_SHORT, CAL_MONTH_GREGORIAN_LONG,
@@ -696,10 +696,10 @@ PHP_FUNCTION(jddayofweek)
daynames = DayNameShort[day];
switch (mode) {
case CAL_DOW_SHORT:
case CAL_DOW_LONG:
RETURN_STRING(daynamel, 1);
break;
case CAL_DOW_LONG:
case CAL_DOW_SHORT:
RETURN_STRING(daynames, 1);
break;
case CAL_DOW_DAYNO:
ext/calendar/tests/jddayofweek.phpt
+1 -1
View File
@@ -6,7 +6,7 @@ jddayofweek()
<?php
foreach (array(2440588, 2452162, 2453926, -1000) as $jd) {
echo "### JD $jd ###\n";
for ($mode = 0; $mode <= 2; $mode++) {
foreach (array(CAL_DOW_DAYNO, CAL_DOW_LONG, CAL_DOW_SHORT) as $mode) {
echo "--- mode $mode ---\n";
for ($offset = 0; $offset <= 7; $offset++) {
echo jddayofweek($jd + $offset, $mode). "\n";