Merge "Moved onArticleEdit() lines around for clarity"