Magellan Linux

Contents of /trunk/phpmyadmin/patches/phpmyadmin-4.4.13.1-fix-doc-pathes.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2687 - (show annotations) (download)
Mon Aug 17 11:57:38 2015 UTC (8 years, 8 months ago) by niro
File size: 1782 byte(s)
-reworked for 4.4.13.1
1 diff -Naur phpMyAdmin-4.4.13.1-all-languages/changelog.php phpMyAdmin-4.4.13.1-all-languages-magellan/changelog.php
2 --- phpMyAdmin-4.4.13.1-all-languages/changelog.php 2015-08-08 18:22:38.000000000 +0200
3 +++ phpMyAdmin-4.4.13.1-all-languages-magellan/changelog.php 2015-08-17 14:01:53.147613890 +0200
4 @@ -42,7 +42,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 @@ -128,7 +128,7 @@
14 '/( ### )(.*)/'
15 => '\\1<b>\\2</b>',
16
17 -);
18 +);*/
19
20 header('Content-type: text/html; charset=utf-8');
21 ?>
22 @@ -144,7 +144,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.4.13.1-all-languages/license.php phpMyAdmin-4.4.13.1-all-languages-magellan/license.php
32 --- phpMyAdmin-4.4.13.1-all-languages/license.php 2015-08-08 18:22:38.000000000 +0200
33 +++ phpMyAdmin-4.4.13.1-all-languages-magellan/license.php 2015-08-17 14:05:14.409392242 +0200
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(__('The %s file is not available on this system, please visit www.phpmyadmin.net for more information.'), $filename);
48 }