[Dbconfig-common-changes] [dbconfig-common] r270 - in trunk: . debian

[Sean Finney]

Author: seanius
Date: 2006-07-27 22:25:34 +0000 (Thu, 27 Jul 2006)
New Revision: 270

Modified:
   trunk/dbconfig-generate-include
   trunk/dbconfig-load-include
   trunk/debian/changelog
Log:
do not end generated php files with a ?>

Modified: trunk/dbconfig-generate-include
===================================================================
--- trunk/dbconfig-generate-include	2006-07-03 13:03:19 UTC (rev 269)
+++ trunk/dbconfig-generate-include	2006-07-27 22:25:34 UTC (rev 270)
@@ -266,7 +266,6 @@
 	[ "$use_dbport" ] && echo "${comment_dbport}\$$dbport_varname='$dbc_dbport';"
 	[ "$use_dbtype" ] && echo "${comment_dbtype}\$$dbtype_varname='$dbc_dbtype';"
 	cat << EOF 
-?>
 EOF
 ;;
 

Modified: trunk/dbconfig-load-include
===================================================================
--- trunk/dbconfig-load-include	2006-07-03 13:03:19 UTC (rev 269)
+++ trunk/dbconfig-load-include	2006-07-27 22:25:34 UTC (rev 270)
@@ -196,7 +196,6 @@
 		echo "dbc_dbport='\$$dbport_varname';\n";
 	if(!empty(\$use_dbtype) && isset(\$$dbtype_varname)) 
 		echo "dbc_dbtype='\$$dbtype_varname';\n";
-?>
 EOF
 ;;
 

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-07-03 13:03:19 UTC (rev 269)
+++ trunk/debian/changelog	2006-07-27 22:25:34 UTC (rev 270)
@@ -1,8 +1,12 @@
 dbconfig-common (1.8.18) UNRELEASED; urgency=low
 
-  [ sean finney ]
   * NOT RELEASED YET
 
+  [ sean finney ]
+  * no longer end php-style generated files with a ?>, as it's 
+    superfluous and can reportedly cause problems (closes: #379979).
+    thanks to Thijs Kinkhorst for pointing this out.
+
   [ Bart Cornelis (cobaco) ]
   * Updated Dutch translation