Refs #2143: General cleanup of input views

git-svn-id: http://code.elgg.org/elgg/trunk@8148 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/views/default/input/checkbox.php b/views/default/input/checkbox.php
index 0fea3d3c6ac6ce330b0483c6aa91881af39c764c..898fe84586dc68e319f380b204c78eff7b51d9d3 100644 (file)
--- a/views/default/input/checkbox.php
+++ b/views/default/input/checkbox.php
@@ -16,16 +16,13 @@
 
 $defaults = array(
        'class' => 'elgg-input-checkbox',
+       'default' => 0,
 );
 
 $vars = array_merge($defaults, $vars);
 
-if (isset($vars['default'])) {
-       $default = $vars['default'];
-       unset($vars['default']);
-} else {
-       $default = 0;
-}
+$default = $vars['default'];
+unset($vars['default']);
 
 if (isset($vars['name']) && $default !== false) {
        echo "<input type=\"hidden\" name=\"{$vars['name']}\" value=\"$default\"/>";

diff --git a/views/default/input/form.php b/views/default/input/form.php
index 50c51be7338d59db18be9cd006e56a02cad9b2bf..5006dc5c89abb73ecb661787cf9db255364c0c02 100644 (file)
--- a/views/default/input/form.php
+++ b/views/default/input/form.php
@@ -18,12 +18,7 @@ $defaults = array(
 
 $vars = array_merge($defaults, $vars);
 
-$body = $vars['body'];
-unset($vars['body']);
-
 $vars['action'] = elgg_normalize_url($vars['action']);
-
-// @todo why?
 $vars['method'] = strtolower($vars['method']);
 
 // Generate a security header
@@ -32,6 +27,8 @@ if (!$vars['disable_security']) {
 }
 unset($vars['disable_security']);
 
+$body = $vars['body'];
+unset($vars['body']);
 
 $attributes = elgg_format_attributes($vars);
 

diff --git a/views/default/input/password.php b/views/default/input/password.php
index 1bd70a419fe8edefdf159996b38170acf998523d..335325c21ed14dd88db1b203965b02838ba0f075 100644 (file)
--- a/views/default/input/password.php
+++ b/views/default/input/password.php
@@ -15,8 +15,7 @@
 $defaults = array(
        'class' => 'elgg-input-password',
        'disabled' => FALSE,
-       
-)
+);
 
 $attrs = array_merge($defaults, $vars);
 ?>

diff --git a/views/default/input/pulldown.php b/views/default/input/pulldown.php
index 994de529707540518e8f3f141c4d908ec09eee97..7053296913008eb0c4bc375d90c7f3e17ef0de7d 100644 (file)
--- a/views/default/input/pulldown.php
+++ b/views/default/input/pulldown.php
@@ -5,4 +5,5 @@
  * @deprecated 1.8
  */
 
+elgg_deprecated_notice("input/pulldown was deprecated by input/dropdown", 1.8);
 echo elgg_view('input/dropdown', $vars);