http://groups.google.com/group/web2py/browse_thread/thread/987f0d84db729a76#, fixed Google Anlytics problem with SSL, thanks Dave

VERSION

@@ -1 +1 @@
-Version 1.99.3 (2011-11-28 08:28:56) dev
+Version 1.99.3 (2011-11-28 23:00:42) dev

applications/welcome/views/layout.html

@@ -158,6 +158,6 @@
 	<script src="{{=URL('static','js/dd_belatedpng.js')}}"></script>
 	<script> DD_belatedPNG.fix('img, .png_bg'); //fix any <img> or .png_bg background-images </script>
 	<![endif]-->
-  {{if response.google_analytics_id:}}<script>/* http://mathiasbynens.be/notes/async-analytics-snippet */ var _gaq=[['_setAccount','{{=response.google_analytics_id}}'],['_trackPageview']];(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.src='//www.google-analytics.com/ga.js';s.parentNode.insertBefore(g,s)}(document,'script')) </script>{{pass}}
+  {{if response.google_analytics_id:}}<script type="text/javascript"> var _gaq = _gaq || []; _gaq.push(['_setAccount', '{{=response.google_analytics_id}}']); _gaq.push(['_trackPageview']); (function() { var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js'; var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); })(); </script> {{pass}}
 </body>
 </html>

gluon/dal.py

@@ -2303,6 +2303,14 @@ class FireBirdAdapter(BaseAdapter):
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=lambda x:x, driver_args={},
                  adapter_args={}):
+        if adapter_args.has_key('driver_name'):
+            if adapter_args['driver_name'] == 'kinterbasdb':
+                self.driver = kinterbasdb
+            elif adapter_args['driver_name'] == 'firebirdsql':
+                self.driver = firebirdsql
+        else:
+            self.driver = kinterbasdb
+
         if not self.driver:
             raise RuntimeError, "Unable to import driver"
         self.db = db
@@ -2334,13 +2342,7 @@ class FireBirdAdapter(BaseAdapter):
                                    user = credential_decoder(user),
                                    password = credential_decoder(password),
                                    charset = charset))
-        if adapter_args.has_key('driver_name'):
+
-            if adapter_args['driver_name'] == 'kinterbasdb':
-                self.driver = kinterbasdb
-            elif adapter_args['driver_name'] == 'firebirdsql':
-                self.driver = firebirdsql
-        else:
-            self.driver = kinterbasdb
         def connect(driver_args=driver_args):
             return self.driver.connect(**driver_args)
         self.pool_connection(connect)
@@ -2365,6 +2367,15 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter):
     def __init__(self,db,uri,pool_size=0,folder=None,db_codec ='UTF-8',
                  credential_decoder=lambda x:x, driver_args={},
                  adapter_args={}):
+
+        if adapter_args.has_key('driver_name'):
+            if adapter_args['driver_name'] == 'kinterbasdb':
+                self.driver = kinterbasdb
+            elif adapter_args['driver_name'] == 'firebirdsql':
+                self.driver = firebirdsql
+        else:
+            self.driver = kinterbasdb
+
         if not self.driver:
             raise RuntimeError, "Unable to import driver"
         self.db = db
@@ -2399,13 +2410,7 @@ class FireBirdEmbeddedAdapter(FireBirdAdapter):
                                    charset=charset))
         #def connect(driver_args=driver_args):
         #    return kinterbasdb.connect(**driver_args)
-        if adapter_args.has_key('driver_name'):
+
-            if adapter_args['driver_name'] == 'kinterbasdb':
-                self.driver = kinterbasdb
-            elif adapter_args['driver_name'] == 'firebirdsql':
-                self.driver = firebirdsql
-        else:
-            self.driver = kinterbasdb
         def connect(driver_args=driver_args):
             return self.driver.connect(**driver_args)
         self.pool_connection(connect)