cakePHP diff

flexyのlayout対応
radioにlabelをつける

diff --exclude=CVS --exclude='*.o' --exclude=.svn -ru cake/libs/view/helper.php /export/home/kuma/cakephp/cake/libs/view/helper.php
--- cake/libs/view/helper.php   2007-02-02 22:20:59.000000000 +0900
+++ /export/home/kuma/cakephp/cake/libs/view/helper.php 2007-05-09 20:43:19.967532000 +0900
@@ -49,7 +49,7 @@
                                                        'hidden' => '<input type="hidden" name="data[%s][%s]" %s/>',
                                                        'textarea' => '<textarea name="data[%s][%s]" %s>%s</textarea>',
                                                        'checkbox' => '<input type="checkbox" name="data[%s][%s]" %s/>',
-                                                       'radio' => '<input type="radio" name="data[%s][%s]" id="%s" %s />%s',
+                                                       'radio' => '<input type="radio" name="data[%s][%s]" id="%s" %s /><label for="%s">%s</label>',
                                                        'selectstart' => '<select name="data[%s][%s]" %s>',
                                                        'selectmultiplestart' => '<select name="data[%s][%s][]" %s>',
                                                        'selectempty' => '<option value="" %s> </option>',
diff --exclude=CVS --exclude='*.o' --exclude=.svn -ru cake/libs/view/helpers/html.php /export/home/kuma/cakephp/cake/libs/view/helpers/html.php
--- cake/libs/view/helpers/html.php     2007-04-06 06:36:04.000000000 +0900
+++ /export/home/kuma/cakephp/cake/libs/view/helpers/html.php   2007-05-09 20:44:00.692470000 +0900
@@ -510,7 +510,7 @@
                        $optValue == $value ? $optionsHere['checked'] = 'checked' : null;
                        $parsedOptions = $this->parseHtmlOptions(array_merge($htmlAttributes, $optionsHere), null, '', ' ');
                        $individualTagName = "{$this->field}_{$optValue}";
-                       $out[] = sprintf($this->tags['radio'], $this->model, $this->field, $individualTagName, $parsedOptions, $optTitle);
+                       $out[] = sprintf($this->tags['radio'], $this->model, $this->field, $individualTagName, $parsedOptions, $individualTagName, $optTitle);
                }

                $out = join($inbetween, $out);
diff --exclude=CVS --exclude='*.o' --exclude=.svn -ru cake/libs/view/view.php /export/home/kuma/cakephp/cake/libs/view/view.php
--- cake/libs/view/view.php     2007-04-06 10:29:26.000000000 +0900
+++ /export/home/kuma/cakephp/cake/libs/view/view.php   2007-05-07 17:48:42.000000000 +0900
@@ -424,7 +424,7 @@
                                $dataForLayout = array_merge($dataForLayout, $this->loaded);
                        }

-                       if (substr($layoutFilename, -5) === 'thtml') {
+                       if (substr($layoutFilename, 0 - strlen($this->ext)) === $this->ext) {
                                $out = View::_render($layoutFilename, $dataForLayout, $loadHelpers, true);
                        } else {
                                $out = $this->_render($layoutFilename, $dataForLayout, $loadHelpers);