Annotation of /trunk/phpmyadmin/patches/phpmyadmin-4.5.5-fix-doc-pathes.patch
Parent Directory | Revision Log
Revision 2766 -
(hide annotations)
(download)
Wed Mar 2 09:02:12 2016 UTC (8 years, 6 months ago) by niro
File size: 1652 byte(s)
Wed Mar 2 09:02:12 2016 UTC (8 years, 6 months ago) by niro
File size: 1652 byte(s)
-re-diffed for 4.5.5
1 | niro | 2766 | diff -Naur phpMyAdmin-4.5.5-all-languages/changelog.php phpMyAdmin-4.5.5-all-languages-magellan/changelog.php |
2 | --- phpMyAdmin-4.5.5-all-languages/changelog.php 2016-02-22 20:00:19.000000000 +0100 | ||
3 | +++ phpMyAdmin-4.5.5-all-languages-magellan/changelog.php 2016-03-02 10:10:31.657536430 +0100 | ||
4 | @@ -45,7 +45,7 @@ | ||
5 | /** | ||
6 | * Whole changelog in variable. | ||
7 | */ | ||
8 | -$changelog = htmlspecialchars($changelog); | ||
9 | +/*$changelog = htmlspecialchars($changelog); | ||
10 | |||
11 | $tracker_url = 'https://sourceforge.net/support/tracker.php?aid=\\1'; | ||
12 | $tracker_url_bug = 'https://sourceforge.net/p/phpmyadmin/bugs/\\1/'; | ||
13 | @@ -131,7 +131,7 @@ | ||
14 | '/( ### )(.*)/' | ||
15 | => '\\1<b>\\2</b>', | ||
16 | |||
17 | -); | ||
18 | +);*/ | ||
19 | |||
20 | header('Content-type: text/html; charset=utf-8'); | ||
21 | ?> | ||
22 | @@ -147,7 +147,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 | <script type="text/javascript"> | ||
31 | diff -Naur phpMyAdmin-4.5.5-all-languages/license.php phpMyAdmin-4.5.5-all-languages-magellan/license.php | ||
32 | --- phpMyAdmin-4.5.5-all-languages/license.php 2016-02-22 20:00:19.000000000 +0100 | ||
33 | +++ phpMyAdmin-4.5.5-all-languages-magellan/license.php 2016-03-02 10:11:33.184851888 +0100 | ||
34 | @@ -19,11 +19,11 @@ | ||
35 | */ | ||
36 | header('Content-type: text/plain; charset=utf-8'); | ||
37 | |||
38 | -$filename = LICENSE_FILE; | ||
39 | +$filename = '/usr/share/doc/phpmyadmin-@@PVER@@/LICENSE.gz'; | ||
40 | |||
41 | // Check if the file is available, some distributions remove these. | ||
42 | -if (@is_readable($filename)) { | ||
43 | - readfile($filename); | ||
44 | +if (file_exists($filename)) { | ||
45 | + readgzfile($filename); | ||
46 | } else { | ||
47 | printf( | ||
48 | __( |