13 files changed, 1 insertions, 49 deletions

diff --git a/views/default/input/access.php b/views/default/input/access.php
index da7853b8b..79807cedd 100644
--- a/views/default/input/access.php
+++ b/views/default/input/access.php
@@ -28,10 +28,6 @@ if (!array_key_exists('value', $vars) || $vars['value'] == ACCESS_DEFAULT) {
 	$vars['value'] = get_default_access();
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 if ((!isset($vars['options'])) || (!is_array($vars['options']))) {
 	$vars['options'] = array();
 	$vars['options'] = get_write_access_array();
diff --git a/views/default/input/checkboxes.php b/views/default/input/checkboxes.php
index f0bf0525b..2ca48459d 100644
--- a/views/default/input/checkboxes.php
+++ b/views/default/input/checkboxes.php
@@ -25,10 +25,6 @@
  *
  */
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) { 
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']); 
-}
-
 $class = (isset($vars['class'])) ? $vars['class'] : 'elgg-input-checkboxes';
 $value = (isset($vars['value'])) ? $vars['value'] : NULL;
 $value_array = (is_array($value)) ? array_map('strtolower', $value) : array(strtolower($value));
diff --git a/views/default/input/datepicker.php b/views/default/input/datepicker.php
index 62c8b31db..6e1d1150d 100644
--- a/views/default/input/datepicker.php
+++ b/views/default/input/datepicker.php
@@ -20,10 +20,6 @@ if (isset($vars['class'])) {
 	$class = 'popup_calendar';
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 if ($vars['value'] > 86400) {
 	//$val = date("F j, Y", $vars['value']);
 	$val = date('n/d/Y', $vars['value']);
diff --git a/views/default/input/dropdown.php b/views/default/input/dropdown.php
index b4d38fb00..99657d983 100644
--- a/views/default/input/dropdown.php
+++ b/views/default/input/dropdown.php
@@ -23,9 +23,6 @@ if (!$class) {
 	$class = "elgg-input-dropdown";
 }
 
-if (!isset($vars['value'])) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
 
 ?>
 <select name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php echo $vars['js']; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> class="<?php echo $class; ?>">
diff --git a/views/default/input/email.php b/views/default/input/email.php
index 577cfbbdb..a6097143a 100644
--- a/views/default/input/email.php
+++ b/views/default/input/email.php
@@ -14,9 +14,6 @@ $defaults = array(
 
 $vars = array_merge($defaults, $vars);
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
 ?>
 
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file
diff --git a/views/default/input/hidden.php b/views/default/input/hidden.php
index a5fb01e73..a201289b7 100644
--- a/views/default/input/hidden.php
+++ b/views/default/input/hidden.php
@@ -13,9 +13,5 @@
  *
  */
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 ?>
 <input type="hidden" <?php echo $vars['js']; ?> name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> value="<?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?>" />
\ No newline at end of file
diff --git a/views/default/input/longtext.php b/views/default/input/longtext.php
index d9862f95c..4a24d1a43 100644
--- a/views/default/input/longtext.php
+++ b/views/default/input/longtext.php
@@ -24,10 +24,6 @@ if (isset($vars['disabled'])) {
 	$disabled = $vars['disabled'];
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 $value = '';
 if (isset($vars['value'])) {
 	$value = $vars['value'];
diff --git a/views/default/input/plaintext.php b/views/default/input/plaintext.php
index 0ca8c07ee..04ff2f1f0 100644
--- a/views/default/input/plaintext.php
+++ b/views/default/input/plaintext.php
@@ -17,10 +17,6 @@ if (!$class) {
 	$class = "elgg-input-textarea";
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 ?>
 
 <textarea class="<?php echo $class; ?>" name="<?php echo $vars['internalname']; ?>" <?php if (isset($vars['internalid'])) echo "id=\"{$vars['internalid']}\""; ?> <?php if ($vars['disabled']) echo ' disabled="yes" '; ?> <?php echo $vars['js']; ?>><?php echo htmlentities($vars['value'], ENT_QUOTES, 'UTF-8'); ?></textarea>
\ No newline at end of file
diff --git a/views/default/input/radio.php b/views/default/input/radio.php
index b2b67616c..9f4c71d32 100644
--- a/views/default/input/radio.php
+++ b/views/default/input/radio.php
@@ -18,11 +18,7 @@ if (!$class) {
 	$class = "elgg-input-radio";
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
-foreach($vars['options'] as $label => $option) {
+foreach ($vars['options'] as $label => $option) {
 	if (strtolower($option) != strtolower($vars['value'])) {
 		$selected = "";
 	} else {
diff --git a/views/default/input/tags.php b/views/default/input/tags.php
index c48793518..539bbd4db 100644
--- a/views/default/input/tags.php
+++ b/views/default/input/tags.php
@@ -14,10 +14,6 @@ $defaults = array(
 
 $vars = array_merge($defaults, $vars);
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 if (is_array($vars['value'])) {
 	$tags = array();
 
diff --git a/views/default/input/text.php b/views/default/input/text.php
index 668102d81..e5af723be 100644
--- a/views/default/input/text.php
+++ b/views/default/input/text.php
@@ -14,9 +14,6 @@ $defaults = array(
 
 $vars = array_merge($defaults, $vars);
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
 ?>
 
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
\ No newline at end of file
diff --git a/views/default/input/url.php b/views/default/input/url.php
index 607720078..a93db718f 100644
--- a/views/default/input/url.php
+++ b/views/default/input/url.php
@@ -13,9 +13,6 @@ $defaults = array(
 
 $vars = array_merge($defaults, $vars);
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
 ?>
 
 <input type="text" <?php echo elgg_format_attributes($vars); ?> />
diff --git a/views/default/input/userpicker.php b/views/default/input/userpicker.php
index c9cfe2d8f..7413da6d4 100644
--- a/views/default/input/userpicker.php
+++ b/views/default/input/userpicker.php
@@ -40,10 +40,6 @@ function user_picker_add_user($user_id) {
 	return $code;
 }
 
-if (!isset($vars['value']) || $vars['value'] === FALSE) {
-	$vars['value'] = elgg_get_sticky_value($vars['internalname']);
-}
-
 // loop over all values and prepare them so that "in" will work in javascript
 $values = array();
 if (!is_array($vars['value'])) {