From 7df97820207fd600bffa2fd484b8be667fe46a4d Mon Sep 17 00:00:00 2001 From: Juan Basso Date: Sun, 23 Jan 2011 16:21:17 -0200 Subject: [PATCH] Moving loadConfig to Html helper. --- cake/libs/view/helper.php | 16 ---------------- cake/libs/view/helpers/html.php | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php index 88588f808..0337b5088 100644 --- a/cake/libs/view/helper.php +++ b/cake/libs/view/helper.php @@ -174,22 +174,6 @@ class Helper extends Object { return $this->{$name} = $value; } -/** - * Parses tag templates into $this->tags. - * - * @param $name file name inside app/config to load. - * @return array merged tags from config/$name.php - */ - public function loadConfig($name = 'tags') { - if (file_exists(CONFIGS . $name .'.php')) { - require(CONFIGS . $name .'.php'); - if (isset($tags)) { - $this->tags = array_merge($this->tags, $tags); - } - } - return $this->tags; - } - /** * Finds URL for specified action. * diff --git a/cake/libs/view/helpers/html.php b/cake/libs/view/helpers/html.php index 21746f60a..d784c6f66 100644 --- a/cake/libs/view/helpers/html.php +++ b/cake/libs/view/helpers/html.php @@ -905,6 +905,22 @@ class HtmlHelper extends AppHelper { return $out; } +/** + * Parses tag templates into $this->tags. + * + * @param $name file name inside app/config to load. + * @return array merged tags from config/$name.php + */ + public function loadConfig($name = 'tags') { + if (file_exists(CONFIGS . $name .'.php')) { + require(CONFIGS . $name .'.php'); + if (isset($tags)) { + $this->_tags = array_merge($this->_tags, $tags); + } + } + return $this->_tags; + } + /** * Returns a space-delimited string with items of the $options array. If a * key of $options array happens to be one of: