From b12fbe8e4c0cb71e79ac882838dbce37b86bd07c Mon Sep 17 00:00:00 2001 From: Penny Leach Date: Thu, 19 Nov 2009 07:03:53 +0000 Subject: [PATCH] portfolio MDL-20905 fixing errors that affected box.net plugin --- lib/portfoliolib.php | 6 ++++++ portfolio/add.php | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/portfoliolib.php b/lib/portfoliolib.php index 7afb72a7ba..6e5aa6821d 100644 --- a/lib/portfoliolib.php +++ b/lib/portfoliolib.php @@ -1017,3 +1017,9 @@ function portfolio_export_pagesetup($PAGE, $caller) { } $PAGE->navbar->add(get_string('exporting', 'portfolio')); } + +function portfolio_export_type_to_id($type, $userid) { + global $DB; + $sql = 'SELECT t.id FROM {portfolio_tempdata} t JOIN {portfolio_instance} i ON t.instance = i.id WHERE t.userid = ? AND i.plugin = ?'; + return $DB->get_field_sql($sql, array($userid, $type)); +} diff --git a/portfolio/add.php b/portfolio/add.php index 7cae4a2396..905e9e575e 100644 --- a/portfolio/add.php +++ b/portfolio/add.php @@ -59,7 +59,7 @@ if ($postcontrol && $type && !$dataid) { throw new portfolio_exception('multiplesingleresume', 'portfolio'); } - if (!$dataid = $DB->get_field('portfolio_tempdata', 'id', array('type' => $type, 'userid' => $USER->id))) { + if (!$dataid = portfolio_export_type_to_id($type, $USER->id)) { throw new portfolio_exception('invalidtempid', 'portfolio'); } } else { -- 2.39.5