- Another case fixed for bug #10018.

1 files changed, 17 insertions, 0 deletions

diff --git a/src/axis/date.php b/src/axis/date.php
index ce7d6b6..bbf2bd4 100644
--- a/src/axis/date.php
+++ b/src/axis/date.php
@@ -218,6 +218,23 @@ class ezcGraphChartElementDateAxis extends ezcGraphChartElementAxis
             }
         }
 
+        if ( ( $this->properties['startDate'] !== false ) &&
+             ( $this->properties['endDate'] !== false ) )
+        {
+            // Use interval between defined borders
+            if ( ( $diff % $interval ) > 0 )
+            {
+                // Stil use predefined date format from old interval if not set
+                if ( $this->properties['dateFormat'] === false )
+                {
+                    $this->properties['dateFormat'] = $this->predefinedIntervals[$interval];
+                }
+
+                $count = ceil( $diff / $interval );
+                $interval = round( $diff / $count, 0 );
+            }
+        }
+
         $this->properties['interval'] = $interval;
     }