Changeset 28926

Timestamp:

Jul 2, 2014, 11:07:16 PM (10 years ago)

Author:

mistic100

Message:

bug 3002: Two classes with the same name : Calendar

Location:

trunk/include

Files:

• calendar_monthly.class.php (modified) (1 diff)
• calendar_weekly.class.php (modified) (1 diff)
• functions_calendar.inc.php (modified) (3 diffs)

trunk/include/calendar_monthly.class.php

@@ -39 +39 @@
  * Monthly calendar style (composed of years/months and days)
  */
-class Calendar extends CalendarBase
+class CalendarMonthly extends CalendarBase
 {
   /**

trunk/include/calendar_weekly.class.php

@@ -39 +39 @@
  * Weekly calendar style (composed of years/week in years and days in week)
  */
-class Calendar extends CalendarBase
+class CalendarWeekly extends CalendarBase
 {
   /**

trunk/include/functions_calendar.inc.php

@@ -115 +115 @@
       'include'        => 'calendar_monthly.class.php',
       'view_calendar'  => true,
+      'classname'      => 'CalendarMonthly',
       ),
     // Weekly style
@@ -120 +121 @@
       'include'        => 'calendar_weekly.class.php',
       'view_calendar'  => false,
+      'classname'      => 'CalendarWeekly',
       ),
     );
@@ -134 +136 @@
   }
   $cal_style = $page['chronology_style'];
+  $classname = $styles[$cal_style]['classname'];
+
   include(PHPWG_ROOT_PATH.'include/'. $styles[$cal_style]['include']);
-  // TODO : class name overlap, rename them in CalendarMonth and CalendarWeek
-  $calendar = new Calendar(); 
+  $calendar = new $classname();
 
   // Retrieve view