Commit c8d76857 authored by Chris Graham's avatar Chris Graham
Browse files

Fixed MANTIS-3914

parent 2777371d
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -60,8 +60,6 @@ FRACTIONAL_EDIT_CANCELLED=You cancelled the inline edit.
AUTO_BAN_SUBJECT={1} has been automatically banned
AUTO_BAN_HACK_MESSAGE=An IP address, {1}, has been automatically banned for generating {2} hackattack alerts. If you believe these were false alarms, or that the user was manipulated into triggering the alerts, you may wish to unban this IP address. A summary of the alerts follows:\n{3}\n\nManage IP bans from this screen:\n[url="{4}"]{4}[/url]
AUTO_BAN_DOS_MESSAGE=An IP address, {1}, has been automatically banned for generating {2} flood warnings in {3} seconds. If you believe that the user was manipulated into triggering the alerts, you may wish to consider unbanning this IP address. Be advised that the website software has essentially prevented what could be a 'DOS' (Denial Of Service) attack which could over-load the server if left to continue; it may have been triggered by innocent infected computers, or other form of computer manipulation. This said, this may just be an innocent computer that accidentally or for good reason, using up a high server load.
NO_SUCH_THEME=No such theme, <kbd>{1}</kbd>.
NO_THEME_PERMISSION=No permission to access theme, <kbd>{1}</kbd>.
NO_SUCH_THEME_IMAGE=No such theme image, <kbd>{1}</kbd>.
PROBLEM_RETRIEVING_XML=There was a problem with an AJAX request:
NETWORK_DOWN=The network or website appears to be down, so an AJAX request has failed. You won't receive further warnings during this page view, but some actions may not work correctly until connectivity is restored.
+0 −2
Original line number Diff line number Diff line
@@ -437,9 +437,7 @@ function _generic_exit($text, $template, $support_match_key_messages = false)
    }
    $EXITING++;

    if (!function_exists('do_header')) {
    require_code('site');
    }

    if ((get_forum_type() == 'cns') && (get_db_type() != 'xml') && (isset($GLOBALS['FORUM_DRIVER']))) {
        require_code('cns_groups');
+1 −9
Original line number Diff line number Diff line
@@ -461,10 +461,7 @@ class Forum_driver_base
        // Try hardcoded in URL
        $theme = $is_current_member ? filter_naughty(get_param_string('keep_theme', get_param_string('utheme', '-1'))) : '-1';
        if ($theme != '-1') {
            if ((!is_dir(get_file_base() . '/themes/' . $theme)) && (!is_dir(get_custom_file_base() . '/themes/' . $theme))) { // Sanity check
                require_code('site');
                attach_message(do_lang_tempcode('NO_SUCH_THEME', escape_html($theme)), 'warn');
            } else {
            if ((is_dir(get_file_base() . '/themes/' . $theme)) || (is_dir(get_custom_file_base() . '/themes/' . $theme))) { // Sanity check
                $zone_theme = ($ZONE === null || !$current_zone_requested) ? $GLOBALS['SITE_DB']->query_select_value_if_there('zones', 'zone_theme', array('zone_name' => $zone_for)) : $ZONE['zone_theme'];

                require_code('permissions');
@@ -476,11 +473,6 @@ class Forum_driver_base
                        $USER_THEME_CACHE = $theme;
                    }
                    return $theme;
                } else {
                    if (running_script('index')) {
                        require_code('site');
                        attach_message(do_lang_tempcode('NO_THEME_PERMISSION', escape_html($theme)), 'warn');
                    }
                }
            }
        }
+0 −2
Original line number Diff line number Diff line
@@ -5574,12 +5574,10 @@ function string_scan($lang, $do_guessing = false, $only_exists = true)
        NO_SUCH_CONTENT_TYPE
        NO_SUCH_RENDERER
        NO_SUCH_SUBSCRIPTION
        NO_SUCH_THEME
        NO_SUCH_THEME_IMAGE
        NO_SUCH_ZONE
        NO_SUICIDAL_SUPER_ADMIN_REMOVAL
        NO_TEMPLATES_SELECTED
        NO_THEME_PERMISSION
        NO_TRACKBACKS
        NO_UPGRADE_DONE
        NO_UPLOAD