Changeset 1121

Timestamp:

06/05/06 00:41:24

Author:

fumanchu

Message:

Reinstated default favicon (when an app is mounted at webserver root).

Files:

• trunk/cherrypy/_cptree.py (modified) (1 diff)

trunk/cherrypy/_cptree.py

@@ -47 +47 @@
-        app = Application(root, script_name, conf)
-        self.apps[script_name] = app
+        
+        # If mounted at "", add favicon.ico
+        if script_name == "" and root and not hasattr(root, "favicon_ico"):
+            import os
+            from cherrypy import tools
+            favicon = os.path.join(os.getcwd(), os.path.dirname(__file__),
+                                   "favicon.ico")
+            root.favicon_ico = tools.staticfile.handler(favicon)
+        
-        return app
-