Changeset 2146 for plugins/pollsFactory/inc/class.postoption.php

Timestamp:

03/30/10 02:37:23 (13 years ago)

Author:

JcDenis

Message:

pollsFactory 1.1:

• Fixed order of queries and selections
• Fixed admin posts list actions
• Fixed adding polls from new post
• Fixed pgSQL bugs

File:

• plugins/pollsFactory/inc/class.postoption.php (modified) (2 diffs)

plugins/pollsFactory/inc/class.postoption.php

@@ -110 +110 @@
      public function getOptions($params=array(),$count_only=false)
      {
-          // This limit field to only one and group results on this field.
-          $group = array();
-          if (!empty($params['group'])) {
-               if (is_array($params['group'])) {
-                    foreach($params['group'] as $k => $v) {
-                         $group[] = $this->con->escape($v);
-                    }
-               }
-               else {
-                    $group[] = $this->con->escape($params['group']);
-               }
-          }
-
           if ($count_only) {
-               if (!empty($group)) {
-                    $q = 'SELECT count('.$group[0].') ';
-               }
-               else {
-                    $q = 'SELECT count(O.option_id) ';
-               }
+               $q = 'SELECT count(O.option_id) ';
           }
           else {
-               if (!empty($group)) {
-                    $q = 'SELECT '.implode(', ',$group).' ';
-               }
-               else {
-                    $q = 'SELECT O.option_id, O.post_id, O.option_meta, ';
-
-                    if (!empty($params['columns']) && is_array($params['columns'])) {
-                         $q .= implode(', ',$params['columns']).', ';
-                    }
-                    $q .= 
-                    'O.option_creadt, O.option_upddt, O.option_type, O.option_format, '.
-                    'O.option_title, O.option_content, O.option_content_xhtml, '.
-                    'O.option_selected, O.option_position, '.
-                    'P.blog_id, P.post_type, P.post_title ';
-               }
+               $q = 'SELECT O.option_id, O.post_id, O.option_meta, ';
+
+               if (!empty($params['columns']) && is_array($params['columns'])) {
+                    $q .= implode(', ',$params['columns']).', ';
+               }
+               $q .= 
+               'O.option_creadt, O.option_upddt, O.option_type, O.option_format, '.
+               'O.option_title, O.option_content, O.option_content_xhtml, '.
+               'O.option_selected, O.option_position, '.
+               'P.blog_id, P.post_type, P.post_title ';
           }
 
@@ -212 +189 @@
                $q .= $params['sql'].' ';
           }
-          # group
-          if (!empty($group)) {
-               if (!$count_only) {
-                    $q .= 'GROUP BY '.implode(', ',$group).' ';
-               }
-               else {
-                    $q .= 'GROUP BY '.$group[0].' ';
-               }
-          }
           # order
           if (!$count_only) {