Merge pull request #4100 from Achal-Aggarwal/typo-get-set

Fixes typo in getter and setter of form fields.
joomla · Oct 3, 2015 · fd65c24 · fd65c24
2 parents cc65be5 + 62138fe
commit fd65c24
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/libraries/cms/form/field/moduleposition.php b/libraries/cms/form/field/moduleposition.php
@@ -48,7 +48,7 @@ public function __get($name)
 		switch ($name)
 		{
 			case 'clientId':
-				return $this->$name;
+				return $this->clientId;
 		}
 
 		return parent::__get($name);

diff --git a/libraries/joomla/form/fields/calendar.php b/libraries/joomla/form/fields/calendar.php
@@ -89,7 +89,6 @@ public function __set($name, $value)
 		{
 			case 'maxlength':
 				$value = (int) $value;
-
 			case 'format':
 			case 'filter':
 				$this->$name = (string) $value;

diff --git a/libraries/joomla/form/fields/checkbox.php b/libraries/joomla/form/fields/checkbox.php
@@ -50,7 +50,7 @@ public function __get($name)
 		switch ($name)
 		{
 			case 'checked':
-				return $this->$name;
+				return $this->checked;
 		}
 
 		return parent::__get($name);
@@ -72,7 +72,7 @@ public function __set($name, $value)
 		{
 			case 'checked':
 				$value = (string) $value;
-				$this->$name = ($value == 'true' || $value == $name || $value == '1');
+				$this->checked = ($value == 'true' || $value == $name || $value == '1');
 				break;
 
 			default:

diff --git a/libraries/joomla/form/fields/file.php b/libraries/joomla/form/fields/file.php
@@ -48,7 +48,7 @@ public function __get($name)
 		switch ($name)
 		{
 			case 'accept':
-				return $this->$name;
+				return $this->accept;
 		}
 
 		return parent::__get($name);
@@ -69,7 +69,7 @@ public function __set($name, $value)
 		switch ($name)
 		{
 			case 'accept':
-				$this->$name = (string) $value;
+				$this->accept = (string) $value;
 				break;
 
 			default:

diff --git a/libraries/joomla/form/fields/meter.php b/libraries/joomla/form/fields/meter.php
@@ -104,12 +104,12 @@ public function __set($name, $value)
 
 			case 'active':
 				$value = (string) $value;
-				$this->$name = ($value === 'true' || $value === $name || $value === '1');
+				$this->active = ($value === 'true' || $value === $name || $value === '1');
 				break;
 
 			case 'animated':
 				$value = (string) $value;
-				$this->$name = !($value === 'false' || $value === 'off' || $value === '0');
+				$this->animated = !($value === 'false' || $value === 'off' || $value === '0');
 				break;
 
 			default:

diff --git a/libraries/joomla/form/fields/plugins.php b/libraries/joomla/form/fields/plugins.php
@@ -48,7 +48,7 @@ public function __get($name)
 		switch ($name)
 		{
 			case 'folder':
-				return $this->$name;
+				return $this->folder;
 		}
 
 		return parent::__get($name);
@@ -69,7 +69,7 @@ public function __set($name, $value)
 		switch ($name)
 		{
 			case 'folder':
-				$this->$name = (string) $value;
+				$this->folder = (string) $value;
 				break;
 
 			default:

diff --git a/libraries/joomla/form/fields/text.php b/libraries/joomla/form/fields/text.php
@@ -93,10 +93,11 @@ public function __set($name, $value)
 
 			case 'dirname':
 				$value = (string) $value;
-				$value = ($value == $name || $value == 'true' || $value == '1');
+				$this->dirname = ($value == $name || $value == 'true' || $value == '1');
+				break;
 
 			case 'inputmode':
-				$this->name = (string) $value;
+				$this->inputmode = (string) $value;
 				break;
 
 			default:

diff --git a/libraries/joomla/form/fields/timezone.php b/libraries/joomla/form/fields/timezone.php
@@ -56,7 +56,7 @@ public function __get($name)
 		switch ($name)
 		{
 			case 'keyField':
-				return $this->$name;
+				return $this->keyField;
 		}
 
 		return parent::__get($name);