Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of ssh://git.kolab.org/git/roundcubemail-plugins-kolab

Browse source
This commit is contained in:
Thomas Bruederli 2014-02-26 12:15:32 +01:00
commit b828aad2b4
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/kolab_files/kolab_files.php
View file

@ -33,7 +33,7 @@ class kolab_files extends rcube_plugin
public function init()
{
$this->rc = rcmail::get_instance();
$this->rc = rcube::get_instance();
// Register hooks
$this->add_hook('refresh', array($this, 'refresh'));

4
plugins/libcalendaring/libcalendaring.php
View file

@ -697,10 +697,10 @@ class libcalendaring extends rcube_plugin
$url = str_replace('&_preload=1', '', $_SERVER['REQUEST_URI']);
$message = $this->rc->gettext('loadingdata');
header('Content-Type: text/html; charset=' . RCMAIL_CHARSET);
header('Content-Type: text/html; charset=' . RCUBE_CHARSET);
print "<html>\n<head>\n"
. '<meta http-equiv="refresh" content="0; url='.Q($url).'">' . "\n"
. '<meta http-equiv="content-type" content="text/html; charset='.RCMAIL_CHARSET.'">' . "\n"
. '<meta http-equiv="content-type" content="text/html; charset='.RCUBE_CHARSET.'">' . "\n"
. "</head>\n<body>\n$message\n</body>\n</html>";
exit;
}