Fix two bugs

Fixed the PHP 5.3 bug for sure this time
Fixed a bug with the "Add Page" template making reference to "Edit Page" variables.