Merge pull request #4107 from davecivicrm/CRM-15258

[civicrm-core.git] / templates / CRM / Form / body.tpl

diff --git a/templates/CRM/Form/body.tpl b/templates/CRM/Form/body.tpl
index d0446f81df27075da2c642a9975563c7092f0d63..d951907da040ec0eac1ae216e1ff3d54a235a279 100644 (file)
--- a/templates/CRM/Form/body.tpl
+++ b/templates/CRM/Form/body.tpl
@@ -23,8 +23,6 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{include file="CRM/common/stateCountry.tpl"}
-
 {if $form.javascript}
   {$form.javascript}
 {/if}
@@ -33,7 +31,7 @@
   <div>{$form.hidden}</div>
 {/if}
 
-{if ($snippet eq 0 or $snippet neq 'json') and !$suppressForm and count($form.errors) gt 0}
+{if ($snippet !== 'json') and !$suppressForm and count($form.errors) gt 0}
    <div class="messages crm-error">
        <div class="icon red-icon alert-icon"></div>
      {ts}Please correct the following errors in the form fields below:{/ts}