From b1641901f2882e9eb00409eba490ef581d09d2ab Mon Sep 17 00:00:00 2001 From: Yuriy Pikhtarev Date: Sat, 21 Jan 2017 23:25:58 +0300 Subject: [PATCH] Tidy deprecated option merge-spans remove --- library/config.php | 6 +++--- library/includes/bbcode.php | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/library/config.php b/library/config.php index 5efccdb02..09bfffa2b 100644 --- a/library/config.php +++ b/library/config.php @@ -97,9 +97,9 @@ $domain_name = 'torrentpier.me'; // enter here your primary domain name of your $domain_name = (!empty($_SERVER['SERVER_NAME'])) ? $_SERVER['SERVER_NAME'] : $domain_name; // Version info -$bb_cfg['tp_version'] = '2.1.5'; -$bb_cfg['tp_release_date'] = '06-12-2014'; -$bb_cfg['tp_release_state'] = 'ALPHA'; +$bb_cfg['tp_version'] = '2.1.6'; +$bb_cfg['tp_release_date'] = '**-02-2017'; +$bb_cfg['tp_release_state'] = 'STABLE'; $bb_cfg['tp_zf_version'] = '2.3.3'; // Database diff --git a/library/includes/bbcode.php b/library/includes/bbcode.php index 8f14f1186..79df9497d 100644 --- a/library/includes/bbcode.php +++ b/library/includes/bbcode.php @@ -437,7 +437,6 @@ class bbcode 'join-classes' => false, 'join-styles' => false, 'merge-divs' => false, - 'merge-spans' => false, 'newline' => 'LF', 'output-xhtml' => true, 'preserve-entities' => true,