diff options
| author | rub <rub@piwigo.org> | 2007-09-29 22:38:49 +0000 |
|---|---|---|
| committer | rub <rub@piwigo.org> | 2007-09-29 22:38:49 +0000 |
| commit | 7948d1871d652f2be95be61399f72ee7bfe7699e (patch) | |
| tree | 6f451a1841f8546cc06d1b6d3078d2acb88e5d5e | |
| parent | f1f4e4386cf1f0e1127c3378037d261401e99246 (diff) | |
Change initialization of $filter in order to prevent of problem with some systems
Merge BSF 2110:2111 into branch-1_7
git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2112 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
| -rw-r--r-- | include/common.inc.php | 3 | ||||
| -rw-r--r-- | include/filter.inc.php | 3 |
2 files changed, 1 insertions, 5 deletions
diff --git a/include/common.inc.php b/include/common.inc.php index cba46b781..8a136bc4f 100644 --- a/include/common.inc.php +++ b/include/common.inc.php @@ -113,6 +113,7 @@ $user = array(); $lang = array(); $header_msgs = array(); $header_notes = array(); +$filter = array(); @include(PHPWG_ROOT_PATH .'include/mysql.inc.php'); if (!defined('PHPWG_INSTALLED')) @@ -251,8 +252,6 @@ if (!empty($conf['filter_pages']) and get_filter_page_value('used')) } else { - // global variable for filter - $filter = array(); $filter['enabled'] = false; } diff --git a/include/filter.inc.php b/include/filter.inc.php index 56617d9ec..e1d1523d1 100644 --- a/include/filter.inc.php +++ b/include/filter.inc.php @@ -23,9 +23,6 @@ // | USA. | // +-----------------------------------------------------------------------+ -// global variable for filter -$filter = array(); - // $filter['enabled']: Filter is enabled // $filter['check_key']: Check key to valitade computed filter data // $filter['recent_period']: Recent period used to computed filter data |