From b52883d72c38e273e8ac219090299f1ad5244e8a Mon Sep 17 00:00:00 2001
From: xzilla <rob@xzilla.net>
Date: Sat, 12 Feb 2011 18:22:13 -0500
Subject: [PATCH] remove several bits of trigger defintion hacks for pre-7.4
 servers.

---
 classes/database/Postgres.php | 7 ++-----
 triggers.php                  | 8 +-------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/classes/database/Postgres.php b/classes/database/Postgres.php
index 1d007b7d..4b019931 100755
--- a/classes/database/Postgres.php
+++ b/classes/database/Postgres.php
@@ -1596,12 +1596,8 @@ class Postgres extends ADODB_base {
 		if ($triggers->recordCount() > 0) {
 			$sql .= "\n-- Triggers\n\n";
 			while (!$triggers->EOF) {
-				// Nasty hack to support pre-7.4 PostgreSQL
-				if ($triggers->fields['tgdef'] !== null)
-					$sql .= $triggers->fields['tgdef'];
-				else
-					$sql .= $this->getTriggerDef($triggers->fields);
 
+				$sql .= $triggers->fields['tgdef'];
 				$sql .= ";\n";
 
 				$triggers->moveNext();
@@ -4913,6 +4909,7 @@ class Postgres extends ADODB_base {
 	/**
 	 * A helper function for getTriggers that translates
 	 * an array of attribute numbers to an array of field names.
+	 * Note: Only needed for pre-7.4 servers, this function is deprecated 
 	 * @param $trigger An array containing fields from the trigger table
 	 * @return The trigger definition string
 	 */
diff --git a/triggers.php b/triggers.php
index 7f586cb2..c81b2a3d 100644
--- a/triggers.php
+++ b/triggers.php
@@ -263,12 +263,6 @@
 
 		function tgPre(&$rowdata,$actions) {
 			global $data;
-			// Nasty hack to support pre-7.4 PostgreSQL
-			$rowdata->fields['+tgdef'] = $rowdata->fields['tgdef'] !== null
-									? $rowdata->fields['tgdef']
-									: $data->getTriggerDef($rowdata->fields);
-
-
 			// toggle enable/disable trigger per trigger
 			if( ! $data->phpBool( $rowdata->fields["tgenabled"] ) ) {
 				unset( $actions['disable'] );
@@ -293,7 +287,7 @@
 			),
 			'definition' => array(
 				'title' => $lang['strdefinition'],
-				'field' => field('+tgdef'),
+				'field' => field('tgdef'),
 			),
 			'function' => array(
 				'title' => $lang['strfunction'],
-- 
2.39.5