From ca21e5b5f49c3fbac5f0c32ec6e1fe59f29f6ce7 Mon Sep 17 00:00:00 2001
From: Alex Marin <alex.ukf@gmail.com>
Date: Tue, 7 Aug 2012 16:22:43 +0300
Subject: [PATCH] oop: properties - fix getText() on a non-object

---
 libraries/plugin_interface.lib.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php
index b7e9d39290..d0b9c45aaf 100644
--- a/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -188,8 +188,12 @@ function PMA_pluginGetChoice($section, $name, &$list, $cfgname = null)
         ) {
             $ret .= ' selected="selected"';
         }
+
+        if (method_exists($plugin->getProperties(), 'getText')) {
+            $text = $plugin->getProperties()->getText();
+        }
         $ret .= ' value="' . $plugin_name . '">'
-           . PMA_getString($plugin->getProperties()->getText())
+           . PMA_getString($text)
            . '</option>' . "\n";
     }
     $ret .= '</select>' . "\n";