Fixed PHP bug #51346 (Extra whitespace when using <type> and plural), reverted r286473
Fixed PHP bug #51346 (Extra whitespace when using <type> and plural), reverted r286473

git-svn-id: 84b5c82ecc7932ed0fd81274a5b44f356df90ae1@296725 c90b9560-bf6c-de11-be94-00142212c4b1

philip/phd,philip/phd