From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Sun, 10 May 2015 17:39:04 +0000 (+0200)
Subject: Merged changes from master branch up to current state.
X-Git-Tag: v2.4.2~19^2~171
X-Git-Url: https://delta.frontaccounting.com/gitweb/?p=fa-stable.git;a=commitdiff_plain;h=8ffddf50ffbe93672c769e2cf0501d0f9125e2a0

Merged changes from master branch up to current state.
---

8ffddf50ffbe93672c769e2cf0501d0f9125e2a0
diff --cc includes/db_pager.inc
index b9e7e759,522b04b6..70243392
--- a/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)