diff --git a/Zotlabs/Widget/Site_projects.php b/Zotlabs/Widget/Site_projects.php index 7618d9fd8..4ceabee0c 100644 --- a/Zotlabs/Widget/Site_projects.php +++ b/Zotlabs/Widget/Site_projects.php @@ -44,7 +44,7 @@ class Site_projects { static function site_sort($a,$b) { if ($a['site_type'] === $b['site_type']) { - return stricmp($a['site_project'],$b['site_project']); + return strcasecmp($b['site_project'],$a['site_project']); } return (($a['site_type'] < $b['site_type']) ? -1 : 1); } diff --git a/boot.php b/boot.php index c67456d13..535e8c430 100755 --- a/boot.php +++ b/boot.php @@ -16,7 +16,7 @@ use Zotlabs\Daemon\Run; * @brief This file defines some global constants and includes the central App class. */ -define ( 'STD_VERSION', '20.12.01' ); +define ( 'STD_VERSION', '20.12.02' ); define ( 'ZOT_REVISION', '6.0' ); define ( 'DB_UPDATE_VERSION', 1246 ); diff --git a/include/bbcode.php b/include/bbcode.php index db4c6fade..86028c795 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -1088,6 +1088,15 @@ function bb_fonttag($matches) { return '' . $matches[2] . ''; } +function bb_sizetag($matches) { + return '' . $matches[2] . ''; + +} + +function bb_hltag($matches) { + return '' . $matches[2] . ''; +} + function bb_xss($s) { // don't allow functions of any kind @@ -1519,14 +1528,14 @@ function bbcode($Text, $options = []) { // Check for highlighted text if (strpos($Text,'[/hl]') !== false) { $Text = preg_replace("(\[hl\](.*?)\[\/hl\])ism", "$1", $Text); - $Text = preg_replace("(\[hl=(.*?)\](.*?)\[\/hl\])ism", "$2", $Text); + $Text = preg_replace_callback("(\[hl=(.*?)\](.*?)\[\/hl\])ism", 'bb_hltag', $Text); } // Check for sized text // [size=50] --> font-size: 50px (with the unit). if (strpos($Text,'[/size]') !== false) { $Text = preg_replace("(\[size=(\d*?)\](.*?)\[\/size\])ism", "$2", $Text); - $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])ism", "$2", $Text); + $Text = preg_replace_callback("(\[size=(.*?)\](.*?)\[\/size\])ism", 'bb_sizetag', $Text); } // Check for h1 if (strpos($Text,'[h1]') !== false) {