This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".
The branch, Branch_5_2 has been updated
via 94ee23b89fe2361a92fc0caefde94f29751102fc (commit)
from 1c98ff1c2941f4abef0e8c7ed9c7d45c90d0c5da (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 94ee23b89fe2361a92fc0caefde94f29751102fc
Author: Franck Villaume <[email protected]>
Date: Fri Jul 4 14:56:33 2014 +0200
fix [#701] Task Export not working due to ambiguous fieldname
diff --git a/src/common/pm/ProjectTaskFactory.class.php
b/src/common/pm/ProjectTaskFactory.class.php
index 0bcb052..ae9f31d 100644
--- a/src/common/pm/ProjectTaskFactory.class.php
+++ b/src/common/pm/ProjectTaskFactory.class.php
@@ -186,7 +186,7 @@ class ProjectTaskFactory extends Error {
$rows = db_numrows($result);
$this->fetched_rows=$rows;
if (db_error()) {
- $this->setError('Database Error: '.db_error().$sql);
+ $this->setError('Database Error: '.db_error());
return false;
}
diff --git a/src/www/pm/downloadcsv.php b/src/www/pm/downloadcsv.php
index 0f58ccf..6f43cc4 100644
--- a/src/www/pm/downloadcsv.php
+++ b/src/www/pm/downloadcsv.php
@@ -97,7 +97,7 @@ if (!$ptf || !is_object($ptf)) {
} elseif ($ptf->isError()) {
exit_error($ptf->getErrorMessage(),'pm');
}
-$ptf->order='external_id';
+$ptf->order='project_task_external_order.external_id';
$pt_arr =& $ptf->getTasks();
if ($ptf->isError()) {
exit_error($ptf->getErrorMessage(),'pm');
-----------------------------------------------------------------------
Summary of changes:
src/common/pm/ProjectTaskFactory.class.php | 2 +-
src/www/pm/downloadcsv.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
