--- a/web/lib/Zend/Date/DateObject.php Thu Mar 21 17:31:31 2013 +0100
+++ b/web/lib/Zend/Date/DateObject.php Thu Mar 21 19:50:53 2013 +0100
@@ -14,8 +14,8 @@
*
* @category Zend
* @package Zend_Date
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
- * @version $Id: DateObject.php 22712 2010-07-29 08:24:28Z thomas $
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
+ * @version $Id: DateObject.php 24880 2012-06-12 20:35:18Z matthew $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@@ -23,7 +23,7 @@
* @category Zend
* @package Zend_Date
* @subpackage Zend_Date_DateObject
- * @copyright Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+ * @copyright Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Date_DateObject {
@@ -312,6 +312,13 @@
}
if (abs($timestamp) <= 0x7FFFFFFF) {
+ // See ZF-11992
+ // "o" will sometimes resolve to the previous year (see
+ // http://php.net/date ; it's part of the ISO 8601
+ // standard). However, this is not desired, so replacing
+ // all occurrences of "o" not preceded by a backslash
+ // with "Y"
+ $format = preg_replace('/(?<!\\\\)o\b/', 'Y', $format);
$result = ($gmt) ? @gmdate($format, $timestamp) : @date($format, $timestamp);
date_default_timezone_set($oldzone);
return $result;