Merge branch 'master' into testing

diff --combined lib/htmloutputter.php
index 47e56fc8f8ba6041c63821c3f534ed2ddaf072a1,4a88337bc509b66429efe6ae4181bcc9953bedef..7315fe2ad44d34c43c107af91da9bbaa6e6c595e
--- 1/lib/htmloutputter.php
--- 2/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@@ -376,20 -376,9 +376,20 @@@ class HTMLOutputter extends XMLOutputte
                      $server = common_config('site', 'server');
                  }
  
 -                // XXX: protocol
 +                $ssl = common_config('javascript', 'ssl');
 +
 +                if (is_null($ssl)) { // null -> guess
 +                    if (common_config('site', 'ssl') == 'always' &&
 +                        !common_config('javascript', 'server')) {
 +                        $ssl = true;
 +                    } else {
 +                        $ssl = false;
 +                    }
 +                }
 +
 +                $protocol = ($ssl) ? 'https' : 'http';
  
 -                $src = 'http://'.$server.$path.$src . '?version=' . STATUSNET_VERSION;
 +                $src = $protocol.'://'.$server.$path.$src . '?version=' . STATUSNET_VERSION;
              }
  
              $this->element('script', array('type' => $type,
@@@ -439,7 -428,7 +439,7 @@@
      {
          if(Event::handle('StartCssLinkElement', array($this,&$src,&$theme,&$media))) {
              $url = parse_url($src);
-             if( empty($url->scheme) && empty($url->host) && empty($url->query) && empty($url->fragment))
+             if( empty($url['scheme']) && empty($url['host']) && empty($url['query']) && empty($url['fragment']))
              {
                  if(file_exists(Theme::file($src,$theme))){
                     $src = Theme::path($src, $theme);