Magellan Linux

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 934 - (hide annotations) (download)
Tue Nov 17 12:27:15 2009 UTC (14 years, 6 months ago) by niro
File size: 1385 byte(s)
re-diffed

1 niro 934 diff -Naur phpMyAdmin-3.2.3-all-languages/changelog.php phpMyAdmin-3.2.3-all-languages-magellan/changelog.php
2     --- phpMyAdmin-3.2.3-all-languages/changelog.php 2009-10-30 17:14:00.000000000 +0100
3     +++ phpMyAdmin-3.2.3-all-languages-magellan/changelog.php 2009-11-17 13:29:37.000000000 +0100
4     @@ -27,7 +27,7 @@
5     /**
6     * Whole changelog in variable.
7     */
8     -$changelog = htmlspecialchars($changelog);
9     +/*$changelog = htmlspecialchars($changelog);
10    
11     $replaces = array(
12     '@(http://[./a-zA-Z0-9.-_-]*[/a-zA-Z0-9_])@'
13     @@ -83,7 +83,7 @@
14     '/( ### )(.*)/'
15     => '\\1<b>\\2</b>',
16    
17     -);
18     +);*/
19    
20     header('Content-type: text/html; charset=utf-8');
21     echo '<?xml version="1.0" encoding="utf-8"?'.'>';
22     @@ -101,7 +101,7 @@
23     <h1>phpMyAdmin - ChangeLog</h1>
24     <?php
25     echo '<pre>';
26     -echo preg_replace(array_keys($replaces), $replaces, $changelog);
27     +readgzfile('/usr/share/doc/phpmyadmin-@@PVER@@/ChangeLog.gz');
28     echo '</pre>';
29     ?>
30     </body>
31     diff -Naur phpMyAdmin-3.2.3-all-languages/license.php phpMyAdmin-3.2.3-all-languages-magellan/license.php
32     --- phpMyAdmin-3.2.3-all-languages/license.php 2009-10-30 17:14:01.000000000 +0100
33     +++ phpMyAdmin-3.2.3-all-languages-magellan/license.php 2009-11-17 13:30:08.000000000 +0100
34     @@ -19,5 +19,5 @@
35     *
36     */
37     header('Content-type: text/plain; charset=iso-8859-1');
38     -readfile(LICENSE_FILE);
39     +readgzfile('/usr/share/doc/phpmyadmin-@@PVER@@/LICENSE.gz');
40     ?>