Changeset 3318 for tags

Timestamp:

08/08/2008 07:53:59 PM (4 months ago)

Author:

Shadowhand

Message:

Merged r3316 and r3317 into tags/2.2, thanks Adurah

Files:

• tags/2.2/application/controllers/examples.php (modified) (2 diffs)

tags/2.2/application/controllers/examples.php

@@ -75 +75 @@
         {
                 // Parse an external atom feed
-                $feed = feed::parse('http://codeigniter.com/feeds/atom/news/');
+                $feed = feed::parse('http://trac.kohanaphp.com/timeline?changeset=on&format=rss');
 
                 // Show debug info
@@ -407 +407 @@
                 $profiler = new Profiler;
 
-                $calendar = new Calendar(8, 2008);
+                $calendar = new Calendar($this->input->get('month', date('m')), $this->input->get('year', date('Y')));
                 $calendar->attach($calendar->event()
                                 ->condition('year', 2008)