From 4c9809dc264ce6cb0a875807ae54848daa1a9e07 Mon Sep 17 00:00:00 2001 From: Andrey Kutejko Date: Sun, 14 Sep 2014 10:32:04 +0300 Subject: [PATCH] remove unescape feature --- ipf/admin/forms/login.php | 2 +- ipf/form/form.php | 23 +++++++---------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/ipf/admin/forms/login.php b/ipf/admin/forms/login.php index a205d09..ef950e4 100644 --- a/ipf/admin/forms/login.php +++ b/ipf/admin/forms/login.php @@ -25,7 +25,7 @@ class IPF_Admin_Forms_Login extends IPF_Form public function render() { - return $this->renderLayout(new IPF_Admin_Form_Layout, false); + return $this->renderLayout(new IPF_Admin_Form_Layout); } } diff --git a/ipf/form/form.php b/ipf/form/form.php index 3f6074f..774f761 100644 --- a/ipf/form/form.php +++ b/ipf/form/form.php @@ -122,7 +122,7 @@ abstract class IPF_Form implements Iterator IPF_Form::renderErrorsAsHTML($this->errors()); } - public function renderLayout($layout, $raw=false) + public function renderLayout($layout) { foreach ($this->field_groups as $field_group) { if (!$field_group['fields']) @@ -167,9 +167,6 @@ abstract class IPF_Form implements Iterator } $output .= $layout->endForm($this); - if (!$raw) - $output = $this->unescape($output); - return $output; } @@ -181,19 +178,19 @@ abstract class IPF_Form implements Iterator return array_unique($extra_js); } - public function render_p($raw=false) + public function render_p() { - return $form->renderLayout(new IPF_Form_ParagraphLayout, $raw); + return $form->renderLayout(new IPF_Form_ParagraphLayout); } - public function render_ul($raw=false) + public function render_ul() { - return $form->renderLayout(new IPF_Form_ListLayout, $raw); + return $form->renderLayout(new IPF_Form_ListLayout); } - public function render_table($raw=false) + public function render_table() { - return $form->renderLayout(new IPF_Form_TableLayout, $raw); + return $form->renderLayout(new IPF_Form_TableLayout); } public function field($key) @@ -236,11 +233,5 @@ abstract class IPF_Form implements Iterator $ul->append(Tag::li(null, $err->message)); return $ul->html(); } - - public function unescape($html) - { - // Do nothing - return $html; - } } -- 2.49.0