auth fix

[quix0rs-gnu-social.git] / lib / htmloutputter.php

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 4a1b7db472a9318dfc13a2802749cded898561dc..b341d14958b44c04615924644d36fd73a1513afe 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -119,9 +119,16 @@ class HTMLOutputter extends XMLOutputter
 
         $language = $this->getLanguage();
 
-        $this->elementStart('html', array('xmlns' => 'http://www.w3.org/1999/xhtml',
-                                          'xml:lang' => $language,
-                                          'lang' => $language));
+        $attrs = array(
+            'xmlns' => 'http://www.w3.org/1999/xhtml',
+            'xml:lang' => $language,
+            'lang' => $language
+        );
+
+        if (Event::handle('StartHtmlElement', array($this, &$attrs))) {
+            $this->elementStart('html', $attrs);
+            Event::handle('EndHtmlElement', array($this, &$attrs));
+        }
     }
 
     function getLanguage()
@@ -393,10 +400,7 @@ class HTMLOutputter extends XMLOutputter
                         $path = common_config('javascript', 'path');
 
                         if (empty($path)) {
-                            $path = common_config('site', 'path') . '/';
-                            if ($fallbackSubdir) {
-                                $path .= $fallbackSubdir . '/';
-                            }
+                            $path = common_config('site', 'path') . '/js/';
                         }
 
                         $server = common_config('javascript', 'server');