Merged changes from master branch up to current state.

diff --cc admin/users.php
Simple merge

diff --cc includes/db_pager.inc
index b9e7e75927445b30fc45140cc9bbe72119a542ca,522b04b6873eb1aa9da1ca2258fa8c053c6d8574..70243392f75e53096ca1c1de63af72fa901c30fc
--- 1/includes/db_pager.inc
--- 2/includes/db_pager.inc
+++ b/includes/db_pager.inc
@@@ -326,9 -310,10 +323,9 @@@ class db_pager 
                            }
                        }
            }
-                               
+ 
            if (count($ord)) {
 -                      $ord = array_map(function_exists('mysql_real_escape_string') ? 
 -                              'mysql_real_escape_string': 'mysql_escape_string', $ord);
 +                      $ord = array_map('db_escape_function', $ord);
                        $sql .= " ORDER BY " . implode(',', $ord);
                } else {
                        if($order)

diff --cc includes/page/header.inc
Simple merge

diff --cc includes/ui/ui_lists.inc
Simple merge

diff --cc purchasing/includes/ui/invoice_ui.inc
Simple merge

diff --cc purchasing/supplier_credit.php
Simple merge