From 98a185d9959e4e273142042b354d42f77e013cdf Mon Sep 17 00:00:00 2001 From: Joe Hunt Date: Wed, 4 Aug 2010 10:59:56 +0000 Subject: [PATCH] Added an extra parameter to db_export in maintenance_db.inc for new COAs Link error in items.php for Pictures --- CHANGELOG.txt | 6 ++++++ admin/db/maintenance_db.inc | 4 +++- inventory/manage/items.php | 2 +- version.php | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ea20c543..18f45176 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -19,6 +19,12 @@ Legend: ! -> Note $ -> Affected files +04-Aug-2010 Joe Hung ++ Added an extra parameter to db_export in maintenance_db.inc for new COAs +$ /admin/db/maintenance_db.inc +# Link error in items.php for Pictures +$ /inventory/manage/items.php + 01-Aug-2010 Joe Hunt + Added Email link when updating documents. $ /sales/credit_note_entry.php diff --git a/admin/db/maintenance_db.inc b/admin/db/maintenance_db.inc index f1acc83a..ed14e56a 100644 --- a/admin/db/maintenance_db.inc +++ b/admin/db/maintenance_db.inc @@ -482,7 +482,7 @@ function db_backup($conn, $ext='no', $comm='', $tbpref = TB_PREF) // generates a dump of $db database // $drop and $zip tell if to include the drop table statement or dry to pack -function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF) +function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF, $no_default=false) { global $app_title, $version, $power_url, $path_to_root; @@ -573,6 +573,8 @@ function db_export($conn, $filename, $zip='no', $comment='', $tbpref = TB_PREF) $out.="### Structure of table `".$tablename."` ###\n\n"; $out.="DROP TABLE IF EXISTS `".$tablename."`;\n\n"; + if ($no_default && ($def_pos = strpos($table_sql[$tablename], "DEFAULT CHARSET")) > 0) + $table_sql[$tablename] = substr($table_sql[$tablename], 0, $def_pos); $out.=$table_sql[$tablename]; // add auto_increment value diff --git a/inventory/manage/items.php b/inventory/manage/items.php index 0793bb38..fad6fc54 100644 --- a/inventory/manage/items.php +++ b/inventory/manage/items.php @@ -393,7 +393,7 @@ if (isset($_POST['NewStockID']) && file_exists(company_path().'/images/' { // 31/08/08 - rand() call is necessary here to avoid caching problems. Thanks to Peter D. $stock_img_link .= "[".$_POST["; $check_remove_image = true; } diff --git a/version.php b/version.php index 73ae4b36..7f2a9fc4 100644 --- a/version.php +++ b/version.php @@ -5,7 +5,7 @@ // // Internal data-source version compatibility check. Do not change. -$core_version = "2.3rc"; +$core_version = "2.3RC1"; // application version - can be set also in config.php if (!isset($version)) -- 2.30.2