remove magic_gpc calling
Merge branch 'master2' into newtinymce