Changeset 18629 for trunk/include/functions_user.inc.php
- Timestamp:
- Oct 12, 2012, 10:00:16 PM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/functions_user.inc.php
r18164 r18629 288 288 global $conf; 289 289 290 $userdata = array();291 292 290 // retrieve basic user data 293 291 $query = ' … … 348 346 349 347 // then merge basic + additional user data 350 $row = array_merge($row, $user_infos_row); 351 352 foreach ($row as $key => $value) 353 { 354 if (!is_numeric($key)) 355 { 356 // If the field is true or false, the variable is transformed into a 357 // boolean value. 358 if ($value == 'true' or $value == 'false') 359 { 360 $userdata[$key] = get_boolean($value); 361 } 362 else 363 { 364 $userdata[$key] = $value; 365 } 366 } 367 } 348 $userdata = array_merge($row, $user_infos_row); 349 350 foreach ($userdata as &$value) 351 { 352 // If the field is true or false, the variable is transformed into a boolean value. 353 if ($value == 'true') 354 { 355 $value = true; 356 } 357 elseif ($value == 'false') 358 { 359 $value = false; 360 } 361 } 362 unset($value); 368 363 369 364 if ($use_cache) … … 644 639 if ($ref_level <> 0) 645 640 { 646 array_push($list_cat_id, $cat_id);641 $list_cat_id[] = $cat_id; 647 642 } 648 643 } … … 663 658 if ($level > $ref_level) 664 659 { 665 array_push($list_cat_id, $id);660 $list_cat_id[] = $id; 666 661 } 667 662 else 668 663 { 669 664 compute_branch_cat_data($cats, $list_cat_id, $level, $ref_level); 670 array_push($list_cat_id, $id);665 $list_cat_id[] = $id; 671 666 } 672 667 $ref_level = $level; … … 830 825 if (is_array($cache['default_user']) and $convert_str) 831 826 { 832 $default_user = array(); 833 foreach ($cache['default_user'] as $name => $value) 834 { 835 // If the field is true or false, the variable is transformed into a 836 // boolean value. 837 if ($value == 'true' or $value == 'false') 838 { 839 $default_user[$name] = get_boolean($value); 840 } 841 else 842 { 843 $default_user[$name] = $value; 827 $default_user = $cache['default_user']; 828 foreach ($default_user as &$value) 829 { 830 // If the field is true or false, the variable is transformed into a boolean value. 831 if ($value == 'true') 832 { 833 $value = true; 834 } 835 elseif ($value == 'false') 836 { 837 $value = false; 844 838 } 845 839 } … … 985 979 )); 986 980 987 array_push($inserts, $insert);981 $inserts[] = $insert; 988 982 } 989 983
Note: See TracChangeset
for help on using the changeset viewer.