Merge branch 'master' of https://github.com/unaio/una

modules/boonex/polls/classes/BxPollsConfig.php

@@ -42,7 +42,7 @@ class BxPollsConfig extends BxBaseModTextConfig
         	'FIELD_CATEGORY' => 'cat',
         	'FIELD_SUBENTRIES' => 'subentries',
             'FIELD_ALLOW_VIEW_TO' => 'allow_view_to',
-        	'FIELD_ANONYMOUS' => 'anonymous',
+        	'FIELD_ANONYMOUS_VOTING' => 'anonymous',
         	'FIELD_HIDDEN_RESULTS' => 'hidden_results',
             'FIELD_PHOTO' => 'pictures',
             'FIELD_THUMB' => 'thumb',

modules/boonex/polls/classes/BxPollsModule.php

@@ -20,7 +20,7 @@ class BxPollsModule extends BxBaseModTextModule
 
         $CNF = &$this->_oConfig->CNF;
         $this->_aSearchableNamesExcept = array_merge($this->_aSearchableNamesExcept, array(
-             $CNF['FIELD_ANONYMOUS'],
+             $CNF['FIELD_ANONYMOUS_VOTING'],
              $CNF['FIELD_HIDDEN_RESULTS']
         ));
     }

modules/boonex/polls/classes/BxPollsTemplate.php

@@ -145,7 +145,7 @@ class BxPollsTemplate extends BxBaseModTextTemplate
             'html_id' => $this->_oConfig->getHtmlIds('content') . $aData[$CNF['FIELD_ID']],
             'bx_repeat:subentries' => $aTmplVarsSubentries,
             'bx_if:show_public' => array(
-                'condition' => (int)$aData[$CNF['FIELD_ANONYMOUS']] == 0,
+                'condition' => (int)$aData[$CNF['FIELD_ANONYMOUS_VOTING']] == 0,
                 'content' => array()
             )
         ));
@@ -155,7 +155,7 @@ class BxPollsTemplate extends BxBaseModTextTemplate
     {
         $CNF = &$this->getModule()->_oConfig->CNF;
 
-        $bAnonymous = (int)$aData[$CNF['FIELD_ANONYMOUS']] == 1;
+        $bAnonymous = (int)$aData[$CNF['FIELD_ANONYMOUS_VOTING']] == 1;
 
         $aSubentries = $this->_oDb->getSubentries(array('type' => 'entry_id', 'entry_id' => $aData[$CNF['FIELD_ID']]));
         if(empty($aSubentries) || !is_array($aSubentries))

modules/boonex/polls/classes/BxPollsVoteSubentries.php

@@ -62,7 +62,7 @@ class BxPollsVoteSubentries extends BxTemplVote
             if(!$this->isPerformed($iObjectId, $iAuthorId))
                 return '';
 
-        if((int)$this->_aContentInfo[$CNF['FIELD_ANONYMOUS']] == 1)
+        if((int)$this->_aContentInfo[$CNF['FIELD_ANONYMOUS_VOTING']] == 1)
             $this->_sTmplNameCounter = 'subentries_vc_text.html';
 
         $sResult = parent::getCounter($aParams);