Ticket #1630

modules/base/text/classes/BxBaseModTextDb.php

@@ -59,6 +59,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS_ANSWERS_VOTES_TRACK']))
+            return false;
+
         if(empty($iAuthorId))
             $iAuthorId = bx_get_logged_profile_id();
 
@@ -73,6 +76,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS']))
+            return false;
+
     	$aMethod = array('name' => 'getAll', 'params' => array(0 => 'query'));
         $sJoinClause = $sWhereClause = $sOrderByClause = "";
 
@@ -147,7 +153,7 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
-        if(empty($aParamsSet) || empty($aParamsWhere))
+        if(empty($CNF['TABLE_POLLS']) || empty($aParamsSet) || empty($aParamsWhere))
             return false;
 
         return $this->query("UPDATE `" . $CNF['TABLE_POLLS'] . "` SET " . $this->arrayToSQL($aParamsSet) . " WHERE " . $this->arrayToSQL($aParamsWhere, " AND "));
@@ -157,6 +163,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS']))
+            return false;
+
         $sWhereClause = $this->arrayToSQL($aParams, " AND ");
         $aPolls = $this->getAll("SELECT * FROM `" . $CNF['TABLE_POLLS'] . "` WHERE " . $sWhereClause);
         if(empty($aPolls) || !is_array($aPolls))
@@ -169,6 +178,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS']))
+            return false;
+
         $sWhereClause = "`id` IN (" . $this->implode_escape(is_array($mixedId) ? $mixedId : array($mixedId)) . ")";
         $aPolls = $this->getAll("SELECT * FROM `" . $CNF['TABLE_POLLS'] . "` WHERE " . $sWhereClause);
         if(empty($aPolls) || !is_array($aPolls))
@@ -181,6 +193,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS_ANSWERS']))
+            return false;
+
     	$aMethod = array('name' => 'getAll', 'params' => array(0 => 'query'));
         $sWhereClause = $sOrderByClause = "";
 
@@ -240,7 +255,7 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
-        if(empty($aParamsSet))
+        if(empty($CNF['TABLE_POLLS_ANSWERS']) || empty($aParamsSet))
             return false;
 
         return $this->query("INSERT INTO `" . $CNF['TABLE_POLLS_ANSWERS'] . "` SET " . $this->arrayToSQL($aParamsSet));
@@ -250,7 +265,7 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
-        if(empty($aParamsSet) || empty($aParamsWhere))
+        if(empty($CNF['TABLE_POLLS_ANSWERS']) || empty($aParamsSet) || empty($aParamsWhere))
             return false;
 
         return $this->query("UPDATE `" . $CNF['TABLE_POLLS_ANSWERS'] . "` SET " . $this->arrayToSQL($aParamsSet) . " WHERE " . $this->arrayToSQL($aParamsWhere, " AND "));
@@ -260,6 +275,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS_ANSWERS']))
+            return false;
+
         $sWhereClause = $this->arrayToSQL($aParams, " AND ");
         $aAnswers = $this->getAll("SELECT * FROM `" . $CNF['TABLE_POLLS_ANSWERS'] . "` WHERE " . $sWhereClause);
         if(empty($aAnswers) || !is_array($aAnswers))
@@ -272,6 +290,9 @@ class BxBaseModTextDb extends BxBaseModGeneralDb
     {
         $CNF = &$this->_oConfig->CNF;
 
+        if(empty($CNF['TABLE_POLLS_ANSWERS']))
+            return false;
+
         $sWhereClause = "`id` IN (" . $this->implode_escape(is_array($mixedId) ? $mixedId : array($mixedId)) . ")";
         $aAnswers = $this->getAll("SELECT * FROM `" . $CNF['TABLE_POLLS_ANSWERS'] . "` WHERE " . $sWhereClause);
         if(empty($aAnswers) || !is_array($aAnswers))

modules/base/text/classes/BxBaseModTextFormsEntryHelper.php

@@ -121,7 +121,7 @@ class BxBaseModTextFormsEntryHelper extends BxBaseModGeneralFormsEntryHelper
         if(!empty($sResult))
             return $sResult;
 
-        $aPolls = $this->_oModule->_oDb->deletePolls(array('content_id' => $iContentId));
+        $this->_oModule->_oDb->deletePolls(array('content_id' => $iContentId));
 
         return '';
     }