Skip to content

Commit

Permalink
Kompatibility patch failed on upgrade
Browse files Browse the repository at this point in the history
https://forum.wbce.org/viewtopic.php?pid=14521#p14521

Fatal error: Cannot redeclare getOutputFilterSettings()
(previously declared in /.../modules/output_filter/upgrade.php:31)
in /.../modules/output_filter/filter_routines.php on line 231
  • Loading branch information
NorHei committed Sep 30, 2017
1 parent ae26e15 commit 0be00dc
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions wbce/modules/output_filter/filter_routines.php
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,7 @@ function executeBackendOutputFilter($content) {
* @param void
* @return array contains all settings
*/
if (!function_exists("getOutputFilterSettings")) {
function getOutputFilterSettings() {
//fetch settings whith default values
$settings = array(
Expand All @@ -229,3 +230,4 @@ function getOutputFilterSettings() {
);
return $settings;
}
}
2 changes: 1 addition & 1 deletion wbce/modules/output_filter/info.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
$module_directory = 'output_filter';
$module_name = 'Output Filter';
$module_function = 'tool';
$module_version = '1.4.1';
$module_version = '1.4.2';
$module_platform = '1.3.0';
$module_author = 'Complete rewrite NorHei(heimsath.org)';
$module_license = 'GNU General Public License v2';
Expand Down
6 changes: 3 additions & 3 deletions wbce/modules/output_filter/upgrade.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
* @param void
* @return array contains all settings
*/
if (!function_exists("getOutputFilterSettings")) {
function getOutputFilterSettings() {
if (!function_exists("getOutputFilterSettingsOld")) {
function getOutputFilterSettingsOld() {
global $database, $admin;
// set default values
$settings = array(
Expand All @@ -54,7 +54,7 @@ function getOutputFilterSettings() {
$msg = '';

// getting old Data
$data = getOutputFilterSettings();
$data = getOutputFilterSettingsOld();

// Set old values if exists otherwise go for default
Settings::Set('opf_droplets',1, false);
Expand Down

0 comments on commit 0be00dc

Please sign in to comment.