Ticket #1033 - Changes in core.

inc/classes/BxDolForm.php

@@ -896,7 +896,15 @@ class BxDolForm extends BxDol implements iBxDolReplaceable
 
     function isSubmitted ()
     {
-        return BxDolForm::getSubmittedValue($this->aParams['db']['submit_name'], $this->aFormAttrs['method'], $this->_aSpecificValues) ? true : false;
+        $aSubmitName = $this->aParams['db']['submit_name'];
+        if(!is_array($aSubmitName))
+            $aSubmitName = array($aSubmitName);
+
+        foreach($aSubmitName as $sSubmitName)
+            if(BxDolForm::getSubmittedValue($sSubmitName, $this->aFormAttrs['method'], $this->_aSpecificValues))
+                return true;
+        
+        return false;
     }
 
     function getId ()

inc/classes/BxDolFormQuery.php

@@ -69,9 +69,16 @@ class BxDolFormQuery extends BxDolDb
         if (!empty($aObject['params']))
             $aAddFormParams = unserialize($aObject['params']);
 
+        $mixedSubminName = '';
+        if (!empty($aObject['submit_name'])) {
+            $mixedSubminName = @unserialize($aObject['submit_name']);
+            if($mixedSubminName === false)
+                $mixedSubminName = $aObject['submit_name'];
+        }
+
         $aDefaultsFormParams = array(
             'db' => array(
-                'submit_name' => $aObject['submit_name'],
+                'submit_name' => $mixedSubminName,
                 'table' => $aObject['table'],
                 'key' => $aObject['key'],
                 'uri' => $aObject['uri'],

modules/base/text/classes/BxBaseModTextFormEntry.php

@@ -22,9 +22,6 @@ class BxBaseModTextFormEntry extends BxBaseModGeneralFormEntry
 
         if (isset($this->aInputs[$CNF['FIELD_ALLOW_VIEW_TO']]))
             $this->aInputs[$CNF['FIELD_ALLOW_VIEW_TO']] = array_merge($this->aInputs[$CNF['FIELD_ALLOW_VIEW_TO']], BxDolPrivacy::getGroupChooser($CNF['OBJECT_PRIVACY_VIEW']));
-
-        if (isset($this->aInputs['do_publish']) && !isset($this->aInputs['do_submit']))
-            $this->aParams['db']['submit_name'] = 'do_publish';
     }
 }