abijah/pmgr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added mechanism to do a full replacement of specified post parameters, instead of just merging.

Browse Source 
git-svn-id: file:///svn-source/pmgr/branches/yafr_20090716@495 97e9348a-65ac-dc4b-aefc-98561f571b83
This commit is contained in:
abijah
2009-08-06 18:06:57 +00:00
parent f3eaa40ea5
commit 58c4f28956
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
site/app_controller.php
View File

@@ -189,17 +189,26 @@ class AppController extends Controller {
// This SHOULD always be set, except when debugging
if (isset($params['post']))
$params['post'] = unserialize($params['post']);
else
$params['post'] = array();
// Unserialize our complex structure of dynamic post data
if (isset($params['dynamic_post']))
$params['dynamic_post'] = unserialize($params['dynamic_post']);
else
$params['dynamic_post'] = null;
// Unserialize our complex structure of dynamic post data
if (isset($params['dynamic_post_replace']))
$params['dynamic_post_replace'] = unserialize($params['dynamic_post_replace']);
else
$params['dynamic_post_replace'] = null;
// Merge the static and dynamic post data
if (empty($params['post']) && !empty($params['dynamic_post']))
$params['post'] = $params['dynamic_post'];
elseif (!empty($params['post']) && !empty($params['dynamic_post']))
//$params['post'] = array_merge($params['post'], $params['dynamic_post']);
if (!empty($params['dynamic_post']))
$params['post'] = array_merge_recursive($params['post'], $params['dynamic_post']);
if (!empty($params['dynamic_post_replace']))
$params['post'] = array_merge($params['post'], $params['dynamic_post_replace']);
// This SHOULD always be set, except when debugging
if (!isset($params['post']['fields']))
@@ -682,7 +691,7 @@ class AppController extends Controller {
function gridDataPostProcessLinks(&$params, &$model, &$records, $links) {
// Don't create any links if ordered not to.
if (isset($params['nolinks']))
if (isset($params['post']['nolinks']))
return;
foreach ($links AS $table => $fields) {