Commit 18d022b0 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-4235 (Possible PHP 7.3 fixes)

parent 7576c076

sources/hooks/modules/admin_import/phpbb3.php

+1 −1
Original line number Diff line number Diff line
@@ -935,7 +935,7 @@ class Hook_phpbb3 
    {

        $orig_post = $post;



        $post = preg_replace('#<!-- [mwl] --><a class="[\w-]+" href="([^"]*)"( onclick="window.open\(this.href\);\s*return false;")?' . '>(.*)</a><!-- [mwl] -->#U', '[url="${3}"]${1}[/url]', $post);

        $post = preg_replace('#<!-- [mwl] --><a class="[\w\-]+" href="([^"]*)"( onclick="window.open\(this.href\);\s*return false;")?' . '>(.*)</a><!-- [mwl] -->#U', '[url="${3}"]${1}[/url]', $post);

        $post = preg_replace('#<!-- e --><a href="mailto:(.*)">(.*)</a><!-- e -->#U', '[email="${2}"]${1}[/email]', $post);



        global $OLD_BASE_URL;

sources/symbols.php

+1 −1
Original line number Diff line number Diff line
@@ -1748,7 +1748,7 @@ function ecv_HEADER_TEXT($lang, $escaped, $param) 
        $comcodeless = strip_comcode($SHORT_TITLE); // This is not HTML



        // Strip 'Welcome to' off if it's there

        $value = cms_preg_replace_safe('#' . preg_quote(do_lang('WELCOME_TO_STRIPPABLE') . ' ' . get_site_name(), '#') . '([^-]+\s*-\s*)?#', '', $comcodeless);

        $value = cms_preg_replace_safe('#' . preg_quote(do_lang('WELCOME_TO_STRIPPABLE') . ' ' . get_site_name(), '#') . '([^\-]+\s*-\s*)?#', '', $comcodeless);



        // Strip site name off it it's there (it'll be put on in the templates, so we don't want it twice)

        $stub = get_site_name() . ' - ';