#4610 removed depreciated code and proper escaping added
#4610 removed depreciated code and proper escaping added

#4610 removed depreciated code and proper escaping added

ahmedkaludi/Accelerated-Mobile-Pages,ahmedkaludi/Accelerated-Mobile-Pages