Merge branch '2.3.x' into 2.3.x-saas

Conflicts: airtime_mvc/application/models/User.php
2013-01-30 18:31:45 -05:00 · 2013-01-30 18:31:45 -05:00 · 0a198ae424
commit 0a198ae424
parent d47469be25 3553ebc2ee
20 changed files with 184 additions and 51 deletions
--- a/airtime_mvc/application/models/User.php
+++ b/airtime_mvc/application/models/User.php
@ -343,6 +343,8 @@ class Application_Model_User
                $res['iTotalDisplayRecords']--;
                $res['iTotalRecords']--;
            }
+
+            $record = array_map('htmlspecialchars', $record);
        }

        $res['aaData'] = array_values($res['aaData']);