From 43b2a1d5945e89007a0d261ea094729831b6bbd2 Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@mcnaughty.com>
Date: Tue, 16 Jun 2015 09:45:39 +1200
Subject: [PATCH] Revert "CRM-16682 add price-set region & placement option"

---
 CRM/Core/Region.php                   | 15 ++-------------
 templates/CRM/Price/Form/PriceSet.tpl |  2 --
 2 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/CRM/Core/Region.php b/CRM/Core/Region.php
index 61feec9ba1..7868cee238 100644
--- a/CRM/Core/Region.php
+++ b/CRM/Core/Region.php
@@ -170,29 +170,18 @@ class CRM_Core_Region {
     $smarty = CRM_Core_Smarty::singleton();
     $html = '';
     foreach ($this->_snippets as $snippet) {
-      $placement = empty($snippet['placement']) ? 'after' : $snippet['placement'];
       if ($snippet['disabled']) {
         continue;
       }
       switch ($snippet['type']) {
         case 'markup':
-          if ($placement == 'before') {
-            $html = $snippet['markup'] . $html;
-          }
-          else {
-            $html .= $snippet['markup'];
-          }
+          $html .= $snippet['markup'];
           break;
 
         case 'template':
           $tmp = $smarty->get_template_vars('snippet');
           $smarty->assign('snippet', $snippet);
-          if ($placement == 'before') {
-            $html = $smarty->fetch($snippet['template']) . $html;
-          }
-          else {
-            $html .= $smarty->fetch($snippet['template']);
-          }
+          $html .= $smarty->fetch($snippet['template']);
           $smarty->assign('snippet', $tmp);
           break;
 
diff --git a/templates/CRM/Price/Form/PriceSet.tpl b/templates/CRM/Price/Form/PriceSet.tpl
index 9ee1f2b0fc..52ad50410b 100644
--- a/templates/CRM/Price/Form/PriceSet.tpl
+++ b/templates/CRM/Price/Form/PriceSet.tpl
@@ -23,7 +23,6 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-{crmRegion name="price-set-1"}
 <div id="priceset" class="crm-section price_set-section">
     {if $priceSet.help_pre}
         <div class="messages help">{$priceSet.help_pre}</div>
@@ -130,4 +129,3 @@
     {include file="CRM/Price/Form/Calculate.tpl"}
 {/if}
 </div>
-{/crmRegion}
-- 
2.25.1