Don't send complete error page to the spellchecker on error (when pspell ex...

Aleksander Machniak

2012-07-31 e22d13bee1d88432ef8cdefd8d4916af10f67b49

 program/include/rcube_template.php

@@ -77,7 +77,7 @@
        $this->set_env('x_frame_options', $this->app->config->get('x_frame_options', 'sameorigin'));

        // load the correct skin (in case user-defined)
        $skin = $this->app->config->get('skin', 'default');
        $skin = $this->app->config->get('skin');
        $this->set_skin($skin);
        $this->set_env('skin', $skin);

@@ -711,7 +711,15 @@
                    $vars = $attrib + array('product' => $this->config['product_name']);
                    unset($vars['name'], $vars['command']);
                    $label = rcube_label($attrib + array('vars' => $vars));
                    return !$attrib['noshow'] ? (get_boolean((string)$attrib['html']) ? $label : Q($label)) : '';
                    $quoting = !empty($attrib['quoting']) ? strtolower($attrib['quoting']) : (get_boolean((string)$attrib['html']) ? 'no' : '');
                    switch ($quoting) {
                        case 'no':
                        case 'raw': break;
                        case 'javascript':
                        case 'js': $label = JQ($label); break;
                        default:   $label = Q($label); break;
                    }
                    return !$attrib['noshow'] ? $label : '';
                }
                break;