- Fixed issue #10881: Wrong labeling with ezcGraphDateAxis

  # Axis labels fixed in two test results, error not noticed before

1 files changed, 14 insertions, 3 deletions

diff --git a/src/axis/date.php b/src/axis/date.php
index 38508bd..bb588b4 100644
--- a/src/axis/date.php
+++ b/src/axis/date.php
@@ -492,19 +492,30 @@ class ezcGraphChartElementDateAxis extends ezcGraphChartElementAxis
      */
     public function getLabel( $step )
     {
+        return $this->getLabelFromTimestamp( $this->startDate + ( $step * $this->interval ), $step );
+    }
+
+    /**
+     * Get label for timestamp
+     * 
+     * @param int $time 
+     * @return string
+     */
+    protected function getLabelFromTimestamp( $time, $step )
+    {
         if ( $this->properties['labelCallback'] !== null )
         {
             return call_user_func_array(
                 $this->properties['labelCallback'],
                 array(
-                    date( $this->properties['dateFormat'], $this->startDate + ( $step * $this->interval ) ),
+                    date( $this->properties['dateFormat'], $time ),
                     $step,
                 )
             );
         }
         else
         {
-            return date( $this->properties['dateFormat'], $this->startDate + ( $step * $this->interval ) );
+            return date( $this->properties['dateFormat'], $time );
         }
     }
 
@@ -527,7 +538,7 @@ class ezcGraphChartElementDateAxis extends ezcGraphChartElementAxis
             $steps[] = new ezcGraphAxisStep(
                 ( $time - $start ) / $distance,
                 $this->interval / $distance,
-                $this->getLabel( $step++ ),
+                $this->getLabelFromTimestamp( $time, $step++ ),
                 array(),
                 $step === 1,
                 $time >= $end