fix login form

diff --git a/ipf/admin/formlayout.php b/ipf/admin/formlayout.php
index 67dad3345cc27ce08e11812ea3d0b21a8c7dbb20..b26cf7a5852948cea2ca7b77c7bd84de558a058d 100644 (file)
--- a/ipf/admin/formlayout.php
+++ b/ipf/admin/formlayout.php
@@ -51,7 +51,7 @@ class IPF_Admin_Form_Layout extends IPF_Form_LayoutAdapter
 
         $ul = Tag::ul(array('class' => 'errorlist'));
         foreach ($errors as $err)
-            $ul->append(Tag::li(null, $err));
+            $ul->append(Tag::li(null, $err->message));
         return Tag::div(array('class' => 'form-row'), $ul);
     }
 }

diff --git a/ipf/admin/forms/login.php b/ipf/admin/forms/login.php
index 37a4ea83dd900f1dcaad74aa00c27a813bfc02d3..a205d09cfa1ae45243092d73da91ca4252db400f 100644 (file)
--- a/ipf/admin/forms/login.php
+++ b/ipf/admin/forms/login.php
@@ -27,10 +27,5 @@ class IPF_Admin_Forms_Login extends IPF_Form
     {
         return $this->renderLayout(new IPF_Admin_Form_Layout, false);
     }
-
-    public function unescape($html)
-    {
-        return new IPF_Template_SafeString($html, true);
-    }
 }
 

diff --git a/ipf/admin/templates/admin/login.html b/ipf/admin/templates/admin/login.html
index f4ee2220f31458d699d3af6d5ccc7bd0666cc9b6..bf7bee99a0477878ee47aed6269f0fd410aaefbc 100644 (file)
--- a/ipf/admin/templates/admin/login.html
+++ b/ipf/admin/templates/admin/login.html
@@ -13,7 +13,7 @@
 <div id="content" class="colM">
   <div id="content-main">
     <form method="post">
-      {$form->render()}
+      {$form->render()|safe}
       <div class="submit-row">
         <input type="submit" value="Sign In" class="default" />
       </div>