More default->larry fixes

Aleksander Machniak

2012-08-18 f26f73a1a3e55095099958a3647b0e1b4f665d0b

More default->larry fixes

Conflicts:

	program/include/rcube_plugin.php

 plugins/hide_blockquote/hide_blockquote.php

@@ -27,11 +27,7 @@
            && ($limit = $rcmail->config->get('hide_blockquote_limit'))
        ) {
            // include styles
            $skin = $rcmail->config->get('skin');
            if (!file_exists($this->home."/skins/$skin/style.css")) {
                $skin = 'default';
            }
            $this->include_stylesheet("skins/$skin/style.css");
            $this->include_stylesheet($this->local_skin_path() . "/style.css");

            // Script and localization
            $this->include_script('hide_blockquote.js');

 plugins/hide_blockquote/skins/larry/style.css

 program/include/rcube_plugin.php

@@ -17,9 +17,6 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

/**
@@ -337,9 +334,13 @@
   */
  public function local_skin_path()
  {
      $skin_path = 'skins/'.$this->api->config->get('skin');
      if (!is_dir(realpath(slashify($this->home) . $skin_path)))
        $skin_path = 'skins/default';
    $rcmail = rcmail::get_instance();
    foreach (array($rcmail->config->get('skin'), 'larry') as $skin) {
      $skin_path = 'skins/' . $skin;
      if (is_dir(realpath(slashify($this->home) . $skin_path)))
        break;
    }

    return $skin_path;
  }