Magellan Linux

Annotation of /trunk/phpmyadmin/patches/phpmyadmin-2.11.2.1-fix-doc-pathes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 405 - (hide annotations) (download)
Mon Nov 12 12:26:48 2007 UTC (16 years, 7 months ago) by niro
File size: 1927 byte(s)
-rediffed against 2.11.2.1, using @@PVER@@ and a sed line to fix the pathes

1 niro 405 diff -Naur phpMyAdmin-2.11.2.1-all-languages/changelog.php phpMyAdmin-2.11.2.1-all-languages-magellan/changelog.php
2     --- phpMyAdmin-2.11.2.1-all-languages/changelog.php 2007-11-11 11:10:52.000000000 +0100
3     +++ phpMyAdmin-2.11.2.1-all-languages-magellan/changelog.php 2007-11-12 13:25:07.000000000 +0100
4     @@ -6,7 +6,7 @@
5     * @version $Id: phpmyadmin-2.11.2.1-fix-doc-pathes.patch,v 1.1 2007-11-12 12:26:48 niro Exp $
6     */
7    
8     -$changelog = htmlspecialchars(file_get_contents('ChangeLog'));
9     +/*$changelog = htmlspecialchars(file_get_contents('ChangeLog'));
10    
11     $replaces = array(
12     '@(http://[./a-zA-Z0-9.-]*[/a-zA-Z0-9])@'
13     @@ -63,6 +63,7 @@
14     => '\\1<b>\\2</b>',
15    
16     );
17     +*/
18    
19     header('Content-type: text/html; charset=utf-8');
20     echo '<?xml version="1.0" encoding="utf-8"?'.'>';
21     @@ -80,7 +81,7 @@
22     <h1>phpMyAdmin - ChangeLog</h1>
23     <?php
24     echo '<pre>';
25     -echo preg_replace(array_keys($replaces), $replaces, $changelog);
26     +readgzfile('/usr/share/doc/phpmyadmin-@@PVER@@/ChangeLog.gz');
27     echo '</pre>';
28     ?>
29     </body>
30     diff -Naur phpMyAdmin-2.11.2.1-all-languages/license.php phpMyAdmin-2.11.2.1-all-languages-magellan/license.php
31     --- phpMyAdmin-2.11.2.1-all-languages/license.php 2007-11-11 11:10:52.000000000 +0100
32     +++ phpMyAdmin-2.11.2.1-all-languages-magellan/license.php 2007-11-12 13:25:58.000000000 +0100
33     @@ -13,5 +13,5 @@
34     *
35     */
36     header('Content-type: text/plain; charset=iso-8859-1');
37     -readfile('LICENSE');
38     +readgzfile('/usr/share/doc/phpmyadmin-@@PVER@@/LICENSE.gz');
39     ?>
40     diff -Naur phpMyAdmin-2.11.2.1-all-languages/readme.php phpMyAdmin-2.11.2.1-all-languages-magellan/readme.php
41     --- phpMyAdmin-2.11.2.1-all-languages/readme.php 2007-11-11 11:10:52.000000000 +0100
42     +++ phpMyAdmin-2.11.2.1-all-languages-magellan/readme.php 2007-11-12 13:26:24.000000000 +0100
43     @@ -13,5 +13,5 @@
44     *
45     */
46     header('Content-type: text/plain; charset=utf-8');
47     -readfile('README');
48     +readgzfile('/usr/share/doc/phpmyadmin-@@PVER@@/README.gz');
49     ?>