Changeset 24907

Timestamp:

11/22/08 17:40:40 (7 weeks ago)

Author:

Guite

Message:

fixed #319 - Bug in pnFormBaseListSelector

Files:

• branches/zikula-1.0/system/pnForm/plugins/pnformbaselistselector.php (modified) (1 diff)
• development/main/system/pnForm/plugins/pnformbaselistselector.php (modified) (1 diff)
• development/zikula-1/system/pnForm/plugins/pnformbaselistselector.php (modified) (1 diff)

branches/zikula-1.0/system/pnForm/plugins/pnformbaselistselector.php

@@ -197 +197 @@
             $value = null;
 
-            if ($this->group == null)
-            {
-                if ($this->dataField != null  &&  isset($values[$this->dataField]))
+            if ($this->group == null) {
+                if ($this->dataField != null && isset($values[$this->dataField])) {
                     $value = $values[$this->dataField];
-                if ($this->itemsDataField != null  &&  isset($values[$this->itemsDataField])) 
+                }
+                if ($this->itemsDataField != null && isset($values[$this->itemsDataField])) { 
                     $items = $values[$this->itemsDataField];
-            }
-            else
-            {
-                if (isset($values[$this->group]))
-                {
-                    $data = $values[$this->group];
-                    if (isset($data[$this->dataField]))
-                    {
-                        $value = $data[$this->dataField];
-                        if ($this->itemsDataField != null  &&  isset($data[$this->itemsDataField]))
-                            $items = $data[$this->itemsDataField];
-                    }
+                }
+            }
+            elseif (isset($values[$this->group])) {
+                $data = $values[$this->group];
+                if (isset($data[$this->dataField])) {
+                    $value = $data[$this->dataField];
+                }
+                if ($this->itemsDataField != null && isset($data[$this->itemsDataField])) {
+                    $items = $data[$this->itemsDataField];
                 }
             }

development/main/system/pnForm/plugins/pnformbaselistselector.php

@@ -197 +197 @@
             $value = null;
 
-            if ($this->group == null)
-            {
-                if ($this->dataField != null  &&  isset($values[$this->dataField]))
+            if ($this->group == null) {
+                if ($this->dataField != null && isset($values[$this->dataField])) {
                     $value = $values[$this->dataField];
-                if ($this->itemsDataField != null  &&  isset($values[$this->itemsDataField])) 
+                }
+                if ($this->itemsDataField != null && isset($values[$this->itemsDataField])) { 
                     $items = $values[$this->itemsDataField];
-            }
-            else
-            {
-                if (isset($values[$this->group]))
-                {
-                    $data = $values[$this->group];
-                    if (isset($data[$this->dataField]))
-                    {
-                        $value = $data[$this->dataField];
-                        if ($this->itemsDataField != null  &&  isset($data[$this->itemsDataField]))
-                            $items = $data[$this->itemsDataField];
-                    }
+                }
+            }
+            elseif (isset($values[$this->group])) {
+                $data = $values[$this->group];
+                if (isset($data[$this->dataField])) {
+                    $value = $data[$this->dataField];
+                }
+                if ($this->itemsDataField != null && isset($data[$this->itemsDataField])) {
+                    $items = $data[$this->itemsDataField];
                 }
             }

development/zikula-1/system/pnForm/plugins/pnformbaselistselector.php

@@ -197 +197 @@
             $value = null;
 
-            if ($this->group == null)
-            {
-                if ($this->dataField != null  &&  isset($values[$this->dataField]))
+            if ($this->group == null) {
+                if ($this->dataField != null && isset($values[$this->dataField])) {
                     $value = $values[$this->dataField];
-                if ($this->itemsDataField != null  &&  isset($values[$this->itemsDataField])) 
+                }
+                if ($this->itemsDataField != null && isset($values[$this->itemsDataField])) { 
                     $items = $values[$this->itemsDataField];
-            }
-            else
-            {
-                if (isset($values[$this->group]))
-                {
-                    $data = $values[$this->group];
-                    if (isset($data[$this->dataField]))
-                    {
-                        $value = $data[$this->dataField];
-                        if ($this->itemsDataField != null  &&  isset($data[$this->itemsDataField]))
-                            $items = $data[$this->itemsDataField];
-                    }
+                }
+            }
+            elseif (isset($values[$this->group])) {
+                $data = $values[$this->group];
+                if (isset($data[$this->dataField])) {
+                    $value = $data[$this->dataField];
+                }
+                if ($this->itemsDataField != null && isset($data[$this->itemsDataField])) {
+                    $items = $data[$this->itemsDataField];
                 }
             }