Move shortcode param builder earlier in function
Merge pull request #2392 from jamesgol/shortcodetags

Move shortcode param builder earlier in function