← Back to branch summary

~ubuntu-branches/ubuntu/dapper/phpmyadmin/dapper-updates

« back to all changes in this revision

Viewing changes to debian/patches/phpmyadmin.002.PHP40203.diff

  • Committer: Bazaar Package Importer
  • Author(s): Piotr Roszatycki
  • Date: 2005-03-11 11:14:05 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20050311111405-rqgg991lcfgc69p3
Tags: 3:2.6.1-pl3-2
http://bugs.debian.org/299034
Fixed the bug in postinst introduced in last upload. Closes: #299034.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/phpmyadmin.002.PHP40203.diff
1
 
diff -ru phpMyAdmin-2.6.0-rc1/main.php phpMyAdmin-2.6.0-rc1.debian/main.php
2
 
--- phpMyAdmin-2.6.0-rc1/main.php       2004-08-03 13:08:20.000000000 +0200
3
 
+++ phpMyAdmin-2.6.0-rc1.debian/main.php        2004-08-09 12:04:08.000000000 +0200
4
 
@@ -718,9 +718,11 @@
5
 
  * modified: 2004-05-05 mkkeck
6
 
  */
7
 
 
8
 
+if (0) :  // commented out for Debian package
9
 
 if (PMA_PHP_INT_VERSION == 40203 && @extension_loaded('mbstring')) {
10
 
     echo '<div class="warning">' . $strPHP40203 . '</div>' . "\n";
11
 
 }
12
 
+endif;
13
 
 
14
 
 /**
15
 
  * Warning for old PHP version