[Xts-commits] r748 - pkg/xts/R

[noreply at r-forge.r-project.org]

Author: jryan
Date: 2012-12-23 16:52:27 +0100 (Sun, 23 Dec 2012)
New Revision: 748

Modified:
   pkg/xts/R/xts.R
Log:
o merged some additional changes back into xts.R related to TZ handling. Still somewhat flaky if you stupidly force a tzone with a Date object.  Caveat emptor? or play nice?


Modified: pkg/xts/R/xts.R
===================================================================
--- pkg/xts/R/xts.R	2012-12-23 15:33:16 UTC (rev 747)
+++ pkg/xts/R/xts.R	2012-12-23 15:52:27 UTC (rev 748)
@@ -56,9 +56,10 @@
     stop("NROW(x) must match length(order.by)")
 
   orderBy <- class(order.by)
-  if(inherits(order.by, 'Date'))
+  if(inherits(order.by, 'Date')) { 
     # convert to GMT POSIXct if specified
     order.by <- .POSIXct(unclass(order.by)*86400, tz=tzone)
+  }
 
 
   if(!is.null(x) && !isOrdered(order.by, strictly=!unique) ) {