From ff901332d2a64766472921d3d3742dc913540508 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:21:47 -0500
Subject: Fix the constructor for Action

Also, fix the startXML() method
---
 lib/action.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'lib/action.php')

diff --git a/lib/action.php b/lib/action.php
index 8694bf47c..4aff4264d 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -58,8 +58,21 @@ class Action extends HTMLOutputter // lawsuit
 {
     var $args;
 
-    function Action()
-    {
+    /**
+     * Constructor
+     *
+     * Just wraps the HTMLOutputter constructor.
+     *
+     * @param string  $output URI to output to, default = stdout
+     * @param boolean $indent Whether to indent output, default true
+     *
+     * @see XMLOutputter::__construct
+     * @see HTMLOutputter::__construct
+     */
+
+    function __construct($output='php://output', $indent=true)
+    {
+        parent::__construct($output, $indent);
     }
 
     // For initializing members of the class
-- 
cgit v1.2.3-54-g00ecf


From 8ff6dc8e32678adc1b1df5fd59fa831aec08f12a Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:23:28 -0500
Subject: startElement() -> elementStart() in Action

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/action.php')

diff --git a/lib/action.php b/lib/action.php
index 4aff4264d..cab51e9ea 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -94,7 +94,7 @@ class Action extends HTMLOutputter // lawsuit
     function showHead()
     {
         // XXX: attributes (profile?)
-        $this->startElement('head');
+        $this->elementStart('head');
         $this->showTitle();
         $this->showStylesheets();
         $this->showScripts();
-- 
cgit v1.2.3-54-g00ecf


From 6a8be40a8cdce09cd994adc4ba3877cf15436128 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 15 Jan 2009 14:24:54 -0500
Subject: elementElement() -> elementEnd() in Action

---
 lib/action.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/action.php')

diff --git a/lib/action.php b/lib/action.php
index cab51e9ea..30a3c8a03 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -102,7 +102,7 @@ class Action extends HTMLOutputter // lawsuit
         $this->showFeeds();
         $this->showDescription();
         $this->extraHead();
-        $this->elementElement('head');
+        $this->elementEnd('head');
     }
 
     function showTitle()
-- 
cgit v1.2.3-54-g00ecf