projects / racktables / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 91bd1d6)
r4326 proxyStaticURI(): add "ico" case
authorDenis Ovsienko <infrastation@yandex.ru>
Fri, 11 Mar 2011 18:32:25 +0000 (18:32 +0000)
committerDenis Ovsienko <infrastation@yandex.ru>
Fri, 11 Mar 2011 18:32:25 +0000 (18:32 +0000)
favicon.ico: move to "pix" directory, so chrome module can handle it
init.php: update HREF respectively
printPDOException(): idem
printGenericException(): idem

wwwroot/inc/exceptions.php patch | blob | blame | history
wwwroot/inc/functions.php patch | blob | blame | history
wwwroot/inc/init.php patch | blob | blame | history
wwwroot/pix/favicon.ico [moved from wwwroot/favicon.ico with 100% similarity] patch | blob | blame | history

diff --git a/wwwroot/inc/exceptions.php b/wwwroot/inc/exceptions.php
index e25601235de1eaa9456dc7bb4088c6b98f07b0f7..1d2807c586ae1afb696874260492f3e646672e42 100644 (file)
--- a/wwwroot/inc/exceptions.php
+++ b/wwwroot/inc/exceptions.php
@@ -177,6 +177,8 @@ function printPDOException($e)
        echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
        echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n";
        echo "<head><title> PDO Exception </title>\n";
+       echo "<link rel=stylesheet type='text/css' href='?module=chrome&uri=css/pi.css' />\n";
+       echo "<link rel=icon href='?module=chrome&uri=pix/favicon.ico' type='image/x-icon' />\n";
        echo '</head> <body>';
        echo '<h2>Pdo exception: '.get_class($e).'</h2><code>'.$e->getMessage().'</code> (<code>'.$e->getCode().'</code>)';
        echo '<p>at file <code>'.$e->getFile().'</code>, line <code>'.$e->getLine().'</code></p><pre>';
@@ -204,8 +206,8 @@ function printGenericException($e)
        echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'."\n";
        echo '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">'."\n";
        echo "<head><title> Exception </title>\n";
-       echo "<link rel=stylesheet type='text/css' href=pi.css />\n";
-       echo "<link rel=icon href='favicon.ico' type='image/x-icon' />";
+       echo "<link rel=stylesheet type='text/css' href='?module=chrome&uri=css/pi.css' />\n";
+       echo "<link rel=icon href='?module=chrome&uri=pix/favicon.ico' type='image/x-icon' />\n";
        echo '</head> <body>';
        echo '<h2>Uncaught exception: '.get_class($e).'</h2><code>'.$e->getMessage().'</code> (<code>'.$e->getCode().'</code>)';
        echo '<p>at file <code>'.$e->getFile().'</code>, line <code>'.$e->getLine().'</code></p><pre>';
diff --git a/wwwroot/inc/functions.php b/wwwroot/inc/functions.php
index 4f2a79cba875300667276bf76d41647c98a857e5..17f20813fafa5bd8cb704037c3d609349559478e 100644 (file)
--- a/wwwroot/inc/functions.php
+++ b/wwwroot/inc/functions.php
@@ -4738,6 +4738,7 @@ function proxyStaticURI ($URI)
                'gif' => 'image/gif',
                'jpg' => 'image/jpeg',
                'jpeg' => 'image/jpeg',
+               'ico' => 'image/x-icon',
        );
        $matches = array();
        if
diff --git a/wwwroot/inc/init.php b/wwwroot/inc/init.php
index 1b2f6c45e8ed411a9d6620593cb849a01b789715..e224d2bce7797347406aac96d19e5fc3b6117237 100644 (file)
--- a/wwwroot/inc/init.php
+++ b/wwwroot/inc/init.php
@@ -152,7 +152,7 @@ $user_given_tags = array();
 // This also can be modified in local.php.
 $pageheaders = array
 (
-       100 => "<link rel='ICON' type='image/x-icon' href='favicon.ico' />",
+       100 => "<link rel='ICON' type='image/x-icon' href='?module=chrome&uri=pix/favicon.ico' />",
 );
 addCSS ('css/pi.css');
 
diff --git a/wwwroot/favicon.ico b/wwwroot/pix/favicon.ico
similarity index 100%
rename from wwwroot/favicon.ico
rename to wwwroot/pix/favicon.ico
[mirror] RackTables current development repository