From b246878717a7c414bfce4cdccdf1e1b30cb547ef Mon Sep 17 00:00:00 2001
From: Alex Marin <alex.ukf@gmail.com>
Date: Fri, 3 Aug 2012 16:55:51 +0300
Subject: [PATCH 1/2] oop: check for undefined variables

---
 libraries/plugin_interface.lib.php           | 19 +++++++++++--------
 libraries/plugins/export/ExportOdt.class.php |  1 +
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index 2a83cf0a67..dd98bcbd88 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -246,7 +246,7 @@ function PMA_pluginGetOneOption(
     }
 
 
-    if ($properties == null) {
+    if (! isset($properties)) {
         $not_subgroup_header = true;
         $properties = $propertyGroup->getProperties();
     }
@@ -385,8 +385,9 @@ function PMA_pluginGetOneOption(
         $ret .= '</ul></li>';
     } else {
         // end main group
-        if ($not_subgroup_header)
+        if (! empty($not_subgroup_header)) {
             $ret .= '</ul></div>';
+        }
     }
 
     if (method_exists($propertyGroup, "getDoc")){
@@ -411,12 +412,14 @@ function PMA_pluginGetOneOption(
     }
 
     // Close the list element after $doc link is displayed
-    if ($property_class == 'BoolPropertyItem'
-        || $property_class == 'MessageOnlyPropertyItem'
-        || $property_class == 'SelectPropertyItem'
-        || $property_class == 'TextPropertyItem'
-    ) {
-        $ret .= '</li>';
+    if (isset($property_class)) {
+        if ($property_class == 'BoolPropertyItem'
+            || $property_class == 'MessageOnlyPropertyItem'
+            || $property_class == 'SelectPropertyItem'
+            || $property_class == 'TextPropertyItem'
+        ) {
+            $ret .= '</li>';
+        }
     }
     $ret .= "\n";
     return $ret;
diff --git a/libraries/plugins/export/ExportOdt.class.php b/libraries/plugins/export/ExportOdt.class.php
index 2556514928..e01f57f499 100644
--- a/libraries/plugins/export/ExportOdt.class.php
+++ b/libraries/plugins/export/ExportOdt.class.php
@@ -53,6 +53,7 @@ class ExportOdt extends ExportPlugin
         include_once "$props/options/items/TextPropertyItem.class.php";
         include_once "$props/options/items/BoolPropertyItem.class.php";
         include_once "$props/options/items/HiddenPropertyItem.class.php";
+        include_once "$props/options/items/RadioPropertyItem.class.php";
 
         $exportPluginProperties = new ExportPluginProperties();
         $exportPluginProperties->setText('Open Document Text');

From c2b54f62b178f9c7b034895af88934e2a5b040fb Mon Sep 17 00:00:00 2001
From: Alex Marin <alex.ukf@gmail.com>
Date: Fri, 3 Aug 2012 17:12:20 +0300
Subject: [PATCH 2/2] oop: fix properties for ExportTexytext

---
 libraries/plugins/export/ExportTexytext.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/plugins/export/ExportTexytext.class.php b/libraries/plugins/export/ExportTexytext.class.php
index 4907b4e73b..df5414a91f 100644
--- a/libraries/plugins/export/ExportTexytext.class.php
+++ b/libraries/plugins/export/ExportTexytext.class.php
@@ -73,10 +73,6 @@ class ExportTexytext extends ExportPlugin
         // add the main group to the root group
         $exportSpecificOptions->addProperty($dumpWhat);
 
-        // set the options for the export plugin property item
-        $exportPluginProperties->setOptions($exportSpecificOptions);
-        $this->properties = $exportPluginProperties;
-
         // data options main group
         $dataOptions = new OptionsPropertyMainGroup();
         $dataOptions->setName("data");
@@ -93,6 +89,10 @@ class ExportTexytext extends ExportPlugin
         $dataOptions->addProperty($leaf);
         // add the main group to the root group
         $exportSpecificOptions->addProperty($dataOptions);
+
+        // set the options for the export plugin property item
+        $exportPluginProperties->setOptions($exportSpecificOptions);
+        $this->properties = $exportPluginProperties;
     }
 
     /**