Renaming Helper::__name to Helper::_name for proper access level for …

…extension overloading and callback.
cakephp · Nov 15, 2009 · 0049c9a · 0049c9a
1 parent 0b2fc5b
commit 0049c9a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/cake/libs/view/helper.php b/cake/libs/view/helper.php
@@ -578,8 +578,9 @@ function domId($options = null, $id = 'id') {
  * @param array $options
  * @param string $key
  * @return array
+ * @access protected
  */
-	function __name($options = array(), $field = null, $key = 'name') {
+	function _name($options = array(), $field = null, $key = 'name') {
 		$view =& ClassRegistry::getObject('view');
 		if ($options === null) {
 			$options = array();
@@ -689,7 +690,7 @@ function _initInputField($field, $options = array()) {
 			$this->setEntity($field);
 		}
 		$options = (array)$options;
-		$options = $this->__name($options);
+		$options = $this->_name($options);
 		$options = $this->value($options);
 		$options = $this->domId($options);
 		if ($this->tagIsInvalid()) {

diff --git a/cake/libs/view/helpers/form.php b/cake/libs/view/helpers/form.php
@@ -1751,8 +1751,9 @@ function dateTime($fieldName, $dateFormat = 'DMY', $timeFormat = '12', $selected
  * @param array $options
  * @param string $key
  * @return array
+ * @access protected
  */
-	function __name($options = array(), $field = null, $key = 'name') {
+	function _name($options = array(), $field = null, $key = 'name') {
 		if ($this->requestType == 'get') {
 			if ($options === null) {
 				$options = array();
@@ -1777,7 +1778,7 @@ function __name($options = array(), $field = null, $key = 'name') {
 				return $name;
 			}
 		}
-		return parent::__name($options, $field, $key);
+		return parent::_name($options, $field, $key);
 	}
 
 /**
@@ -1846,7 +1847,7 @@ function __selectOptions($elements = array(), $selected = null, $parents = array
 							$label['class'] = 'selected';
 						}
 
-						list($name) = array_values($this->__name());
+						list($name) = array_values($this->_name());
 
 						if (empty($attributes['class'])) {
 							$attributes['class'] = 'checkbox';