diff --git a/View/Helper/LinkButtonHelper.php b/View/Helper/LinkButtonHelper.php index 7878fa39..ccd84445 100644 --- a/View/Helper/LinkButtonHelper.php +++ b/View/Helper/LinkButtonHelper.php @@ -57,7 +57,7 @@ public function add($title = '', $url = null, $options = array()) { $url['controller'] = $this->_View->viewVars['addActionController']; } } - $url = NetCommonsUrl::actionUrl(Hash::merge($defaultUrl, $url)); + $url = NetCommonsUrl::actionUrlAsArray(Hash::merge($defaultUrl, $url)); } //Linkオプションの設定 diff --git a/View/Helper/NetCommonsHtmlHelper.php b/View/Helper/NetCommonsHtmlHelper.php index 163f9bfc..f2a8897f 100644 --- a/View/Helper/NetCommonsHtmlHelper.php +++ b/View/Helper/NetCommonsHtmlHelper.php @@ -152,7 +152,7 @@ private function __getUrl($url = null) { if (! isset($url['frame_id']) && Current::read('Frame.id')) { $url['frame_id'] = Current::read('Frame.id'); } - $url = NetCommonsUrl::actionUrl($url); + $url = NetCommonsUrl::actionUrlAsArray($url); } return $url; } @@ -187,6 +187,20 @@ public function link($title = '', $url = null, $options = array()) { return $output; } +/** + * ``タグの出力 + * + * @param mixed $path URL + * @param array $options HTML属性オプション + * @return string ``タグ + * @link http://book.cakephp.org/2.0/ja/core-libraries/helpers/html.html#HtmlHelper::image + */ + public function image($path, $options = array()) { + $path = $this->__getUrl($path); + $output = $this->Html->image($path, $options); + return $output; + } + /** * タイトル(ブロックタイトル)の出力 * @@ -252,7 +266,7 @@ public function editLink($title = '', $url = null, $options = array()) { if (! isset($url['frame_id']) && Current::read('Frame.id')) { $url['frame_id'] = Current::read('Frame.id'); } - $url = NetCommonsUrl::actionUrl($url); + $url = NetCommonsUrl::actionUrlAsArray($url); return $this->Html->link($title, $url, $options); }