fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-04-02 01:52:10 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3.2(r11162 ~ r11201)

Browse source 
and from luminous (r11141 ~ r11193)

git-svn-id: http://xe-core.googlecode.com/svn/branches/maserati@11202 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
devjin 2012-09-11 02:52:49 +00:00
parent 773a666d12
commit 42eb19ae10
32 changed files with 340 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/poll/poll.admin.controller.php
View file

@ -80,12 +80,19 @@
/**
* @brief Delete the poll (when several questions are registered in one poll, delete this question)
**/
function deletePollTitle($poll_index_srl) {
function deletePollTitle($poll_index_srl)
{
$args->poll_index_srl = $poll_index_srl;
$oDB = &DB::getInstance();
$oDB->begin();
$output = executeQueryArray('poll.getPollByDeletePollTitle', $args);
if($output->toBool() && $output->data && $output->data[0]->count == 1)
{
$dargs->poll_srl = $output->data[0]->poll_srl;
}
$output = $oDB->executeQuery('poll.deletePollTitle', $args);
if(!$output) {
$oDB->rollback();
@ -98,6 +105,20 @@
return $output;
}
if($dargs->poll_srl)
{
$output = executeQuery('poll.deletePoll', $dargs);
if(!$output) {
$oDB->rollback();
return $output;
}
$output = executeQuery('poll.deletePollLog', $dargs);
if(!$output) {
$oDB->rollback();
return $output;
}
}
$oDB->commit();
return new Object();