Permalink
Browse files

Merge branch 'QA_3_5'

Conflicts:
	po/de.po
	po/pt_BR.po
	po/sl.po
	po/th.po
  • Loading branch information...
madhuracj committed Aug 26, 2012
2 parents 9bb9d62 + 6160f90 commit 5e13ef82953525e9154c31c62444a25be7ba9578
Showing with 3 additions and 0 deletions.
  1. +1 −0 ChangeLog
  2. +2 −0 tbl_replace.php
View
@@ -62,6 +62,7 @@ VerboseMultiSubmit, ReplaceHelpImg
- bug #3555104 [edit] Cannot copy a DB with table & views
- bug #3559925 [privileges] Incorrect updating of the list of users
- bug #3561224 [edit] cell edit date field with empty date fills in current date
+- bug #3559955 [edit] current_date from function drop down fails on update
3.5.2.2 (2012-08-12)
- [security] Fixed XSS vulnerabilities, see PMASA-2012-4
View
@@ -77,6 +77,8 @@
'CURRENT_USER',
'CURDATE',
'CURTIME',
+ 'CURRENT_DATE',
+ 'CURRENT_TIME',
'DATABASE',
'LAST_INSERT_ID',
'NOW',

0 comments on commit 5e13ef8

Please sign in to comment.