com php-src: Merge branch 'PHP-5.6': ext/calendar/calendar.c
| From: | Ferenc Kovacs | Date: | Fri, 02 Jan 2015 09:16:37 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6': ext/calendar/calendar.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-83950@lists.php.net to get a copy of this message | ||
Commit: c3b44b1175c880c118132b5d12cbff9f2aaa4f65
Author: Ferenc Kovacs <tyrael@php.net> Fri, 2 Jan 2015 10:16:37 +0100
Parents: 95e04fed242ac37b950e935a51be7171ec140fb2 fe46966678db3b82b66b715d37c6254d81dbe568
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c3b44b1175c880c118132b5d12cbff9f2aaa4f65
Log:
Merge branch 'PHP-5.6'
* PHP-5.6:
Fixes #67960 - Long/short day names reversed in jddayofweek()
Conflicts:
ext/calendar/calendar.c
Bugs:
https://bugs.php.net/67960
Changed paths:
MM ext/calendar/calendar.c
Diff:
diff --cc ext/calendar/calendar.c
index 0f94b08,7ef03f0..78834ef
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@@@ -694,11 -696,11 +694,11 @@@ PHP_FUNCTION(jddayofweek
daynames = DayNameShort[day];
switch (mode) {
- case CAL_DOW_SHORT:
+ case CAL_DOW_LONG:
- RETURN_STRING(daynamel, 1);
+ RETURN_STRING(daynamel);
break;
- case CAL_DOW_LONG:
+ case CAL_DOW_SHORT:
- RETURN_STRING(daynames, 1);
+ RETURN_STRING(daynames);
break;
case CAL_DOW_DAYNO:
default: