From 4d2b4779d43edfe93779ac87616e323f8efcac7b Mon Sep 17 00:00:00 2001 From: abijah Date: Tue, 16 Jun 2009 04:48:52 +0000 Subject: [PATCH] Fixed bug created when controller was added as an optional parameter to Links git-svn-id: file:///svn-source/pmgr/branches/ledger_transactions_20090605@146 97e9348a-65ac-dc4b-aefc-98561f571b83 --- site/app_controller.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/site/app_controller.php b/site/app_controller.php index 587c9a9..7b39f5e 100644 --- a/site/app_controller.php +++ b/site/app_controller.php @@ -293,14 +293,12 @@ class AppController extends Controller { function jqGridRecordLinks(&$params, &$model, &$records, $links) { foreach ($links AS $table => $fields) { + $special = array('controller', 'id'); $controller = Inflector::pluralize(Inflector::underscore($table)); $id = 'id'; - if (isset($fields['controller'])) - $controller = $fields['controller']; - if (isset($fields['id'])) - $id = $fields['id']; + extract(array_intersect_key($fields, array_flip($special))); foreach ($records AS &$record) { - foreach (array_diff_key($fields, array('id'=>1)) AS $field) { + foreach (array_diff_key($fields, array_flip($special)) AS $field) { // DEBUG PURPOSES ONLY! //$params['linkrecord'][] = compact('table', 'field', 'id', 'controller', 'record'); $record[$table][$field] =