Enigma: Fix compatibility with assets_dir

release-1.2
Aleksander Machniak 8 years ago
parent 58d7cdc3fc
commit 793bf96747

@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
- Enigma: Fix compatibility with assets_dir
- Fix bug where comment notation within style tag would cause the whole style to be ignored (#5747)
- Fix bug where it wasn't possible to scroll folders list in Edge (#5750)
- Fix addressbook searching by gender (#5757)

@ -116,14 +116,12 @@ class enigma_ui
*/
function add_css()
{
if ($this->css_loaded)
if ($this->css_loaded) {
return;
$skin_path = $this->enigma->local_skin_path();
if (is_file($this->home . "/$skin_path/enigma.css")) {
$this->enigma->include_stylesheet("$skin_path/enigma.css");
}
$skin_path = $this->enigma->local_skin_path();
$this->enigma->include_stylesheet("$skin_path/enigma.css");
$this->css_loaded = true;
}
@ -185,17 +183,7 @@ class enigma_ui
*/
function tpl_key_frame($attrib)
{
if (!$attrib['id']) {
$attrib['id'] = 'rcmkeysframe';
}
$attrib['name'] = $attrib['id'];
$this->rc->output->set_env('contentframe', $attrib['name']);
$this->rc->output->set_env('blankpage', $attrib['src'] ?
$this->rc->output->abs_url($attrib['src']) : 'program/resources/blank.gif');
return $this->rc->output->frame($attrib);
return $this->rc->output->frame($attrib, true);
}
/**

Loading…
Cancel
Save