From 9a2b3bfe8ff89662ff006a9a267733934da36c24 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 25 Jun 2011 01:05:21 +0000 Subject: [PATCH] Renamed generic 'data' to 'filterData' --- inc/filter-functions.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inc/filter-functions.php b/inc/filter-functions.php index 066ca22365..4acb78d90f 100644 --- a/inc/filter-functions.php +++ b/inc/filter-functions.php @@ -249,9 +249,9 @@ function unregisterFilter ($F, $L, $filterName, $filterFunction, $force = false, //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'ENTRY: F=' . $F . ',L=' . $L . ',filterName=' . $filterName . ',filterFunction=' . $filterFunction . ',force=' . intval($force) . ',dry=' . intval($dry_run) . ' - EXIT!'); } -// "Runs" the given filters, data is optional and can be any type of data -function runFilterChain ($filterName, $data = null) { - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',data[]=' . gettype($data) . ' - ENTERED!'); +// "Runs" the given filters, filterData is optional and can be any type of data +function runFilterChain ($filterName, $filterData = null) { + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterData[]=' . gettype($filterData) . ' - ENTERED!'); // Is that filter chain there? if (!isset($GLOBALS['cache_array']['filter']['chains'][$filterName])) { @@ -262,11 +262,11 @@ function runFilterChain ($filterName, $data = null) { } // END - if // Abort here and return content - return $data; + return $filterData; } // END - if // Default return value - $returnValue = $data; + $returnValue = $filterData; // Then run all filters foreach ($GLOBALS['cache_array']['filter']['chains'][$filterName] as $filterFunction => $active) { @@ -297,7 +297,7 @@ function runFilterChain ($filterName, $data = null) { } // END - foreach // Return the filtered content - //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',data[]=' . gettype($data) . ',returnValue[]=' . gettype($returnValue) . ' - EXIT!'); + //* DEBUG: */ logDebugMessage(__FUNCTION__, __LINE__, 'filterName=' . $filterName . ',filterData[]=' . gettype($filterData) . ',returnValue[]=' . gettype($returnValue) . ' - EXIT!'); return $returnValue; } -- 2.39.5