From 80176be49794fadd8f698257b03067c3225c5621 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 5 Aug 2005 10:50:49 +0000
Subject: [PATCH] bug #965548, displaying README and LICENSE

---
 ChangeLog          |  4 ++++
 Documentation.html |  6 +++---
 license.php        | 10 ++++++++++
 readme.php         | 10 ++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 license.php
 create mode 100644 readme.php

diff --git a/ChangeLog b/ChangeLog
index a669cd453..2b2821941 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-08-05 Marc Delisle  <lem9@users.sourceforge.net>
+    * Documentation.html, readme.php, license.php: 
+      bug #965548, displaying README and LICENSE, thanks to Ryan Schmidt
+
 2005-08-04 Michal Čihař  <michal@cihar.com>
     * libraries/common.lib.php, export.php: Show error header on error to make
       clear that something bad has happened.
diff --git a/Documentation.html b/Documentation.html
index 2d0ef9105..d53292e47 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -44,9 +44,9 @@
     <li>
         Local documents:
         <ul>
-            <li>Version history: <a href="ChangeLog">ChangeLog</a></li>
-            <li>General notes: <a href="README">README</a></li>
-            <li>License: <a href="LICENSE">LICENSE</a></li>
+            <li>Version history: <a href="changelog.php">ChangeLog</a></li>
+            <li>General notes: <a href="readme.php">README</a></li>
+            <li>License: <a href="license.php">LICENSE</a></li>
         </ul>
     </li>
     <li>
diff --git a/license.php b/license.php
new file mode 100644
index 000000000..40a184afe
--- /dev/null
+++ b/license.php
@@ -0,0 +1,10 @@
+<?php
+// Simple script to set correct charset for the license
+// vim: expandtab sw=4 ts=4 sts=4:
+//
+// Note: please do not fold this script into a general script
+// that would read any file using a GET parameter, it would open a hole
+
+header('Content-type: text/plain; charset=iso-8859-1');
+readfile('LICENSE');
+?>
diff --git a/readme.php b/readme.php
new file mode 100644
index 000000000..cd7f4c615
--- /dev/null
+++ b/readme.php
@@ -0,0 +1,10 @@
+<?php
+// Simple script to set correct charset for the readme
+// vim: expandtab sw=4 ts=4 sts=4:
+//
+// Note: please do not fold this script into a general script
+// that would read any file using a GET parameter, it would open a hole
+
+header('Content-type: text/plain; charset=iso-8859-1');
+readfile('README');
+?>