scoping issues

Conflicts:
	modules/publish/classes/B2DB/TBGArticleHistoryTable.class.php