Datalist: Corrected unnecessary conditional nesting.
Merge pull request #3013 from pjackson28/fixdatalistconditionals

Datalist: Corrected unnecessary conditional nesting.
Merge branch 'v3.0'