Item12559: fixed EXPAND messing around with the current topic context



git-svn-id: http://svn.foswiki.org/trunk@16848 0b4bb1d4-4e5a-0410-9cc4-b2b747904278