Temporary fixes for php encoding library bugs ending with segfault.

[fa-stable.git] / includes / ui / ui_input.inc

diff --git a/includes/ui/ui_input.inc b/includes/ui/ui_input.inc
index 2a4d75fd308c154c6475b84a440807bd4ff9af9f..054af15e98ee463c3587ab87b11e4908de4089f1 100644 (file)
--- a/includes/ui/ui_input.inc
+++ b/includes/ui/ui_input.inc
@@ -304,7 +304,7 @@ function button($name, $value, $title=false, $icon=false,  $aspect='')
                if ($value == _("Delete")) // Helper during implementation
                        $icon = ICON_DELETE;
                return "<button type='submit' class='editbutton' name='"
-                       .htmlentities(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
+                       .html_specials_encode(strtr($name, array('.'=>'=2E', '='=>'=3D',// ' '=>'=20','['=>'=5B'
                        )))
                        ."' value='1'" . ($title ? " title='$title'":" title='$value'")
                        . ($aspect ? " aspect='$aspect'" : '')
@@ -347,9 +347,7 @@ function select_button_cell($name, $value, $title=false)
 
 function check_value($name)
 {
-    if (!isset($_POST[$name]) || ($_POST[$name]+0) === 0)
-               return 0;
-       return 1;
+    return (empty($_POST[$name]) ? 0 : 1);
 }
 
 function checkbox($label, $name, $value=null, $submit_on_change=false, $title=false)
@@ -728,7 +726,7 @@ function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit
                if (empty($_POST[$name.'_list'])) // restore refline id
                        $_POST[$name.'_list'] = $Refs->reflines->find_refline_id(empty($_POST[$name]) ? $init : $_POST[$name], $type);
 
-               if (empty($_POST[$name]) || ($_SERVER['REQUEST_METHOD'] == 'GET')) // initialization
+               if (empty($_POST[$name])) // initialization
                {
                        if (isset($init))
                        {
@@ -740,7 +738,7 @@ function ref_cells($label, $name, $title=null, $init=null, $params=null, $submit
                }
 
                if (check_ui_refresh($name)) { // call context changed
-                       $_POST[$name] = $Refs->normalize($init, $type, $context, $_POST[$name.'_list']);
+                       $_POST[$name] = $Refs->normalize($_POST[$name], $type, $context, $_POST[$name.'_list']);
                        $Ajax->addUpdate(true, $name, $_POST[$name]);
                }