- jQuery 1.5.1

alecpl

2011-02-25 041f66e0744d0b3afb78e35f9ed168e9d20b3614

 program/include/rcube_template.php

@@ -84,7 +84,7 @@
        $this->add_script($javascript, 'head_top');
        $this->add_script($javascript_foot, 'foot');
        $this->scripts_path = 'program/js/';
        $this->include_script('jquery-1.4.min.js');
        $this->include_script('jquery-1.5.min.js');
        $this->include_script('common.js');
        $this->include_script('app.js');

@@ -255,10 +255,8 @@
    {
        if ($override || !$this->message) {
            $this->message = $message;
            $this->command(
                'display_message',
                rcube_label(array('name' => $message, 'vars' => $vars)),
                $type);
            $msgtext = rcube_label_exists($message) ? rcube_label(array('name' => $message, 'vars' => $vars)) : $message;
            $this->command('display_message', $msgtext, $type);
        }
    }

@@ -996,8 +994,11 @@
        $attrib['action'] = './';

        // we already have a <form> tag
        if ($attrib['form'])
        if ($attrib['form']) {
            if ($this->framed || !empty($_REQUEST['_framed']))
                $hidden->add(array('name' => '_framed', 'value' => '1'));
            return $hidden->show() . $content;
        }
        else
            return $this->form_tag($attrib, $hidden->show() . $content);
    }
@@ -1031,7 +1032,7 @@
            $username = $this->app->user->get_username();
        }

        return idn_to_utf8($username);
        return rcube_idn_to_utf8($username);
    }