Merge remote-tracking branch 'alex/plugins-and-OOP'

phpmyadmin · Aug 14, 2012 · ae3db91 · ae3db91
2 parents 7ca27e2 + 92bb8d4
commit ae3db91
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/libraries/plugins/export/ExportCodegen.class.php b/libraries/plugins/export/ExportCodegen.class.php
@@ -87,13 +87,13 @@ protected function setProperties()
         $exportPluginProperties->setExtension('cs');
         $exportPluginProperties->setMimeType('text/cs');
         $exportPluginProperties->setOptionsText(__('Options'));
-        
+
         // create the root group that will be the options field for
         // $exportPluginProperties
         // this will be shown as "Format specific options"
         $exportSpecificOptions = new OptionsPropertyRootGroup();
         $exportSpecificOptions->setName("Format Specific Options");
-        
+
         // general options main group
         $generalOptions = new OptionsPropertyMainGroup();
         $generalOptions->setName("general_opts");
@@ -108,7 +108,7 @@ protected function setProperties()
         $generalOptions->addProperty($leaf);
         // add the main group to the root group
         $exportSpecificOptions->addProperty($generalOptions);
-        
+
         // set the options for the export plugin property item
         $exportPluginProperties->setOptions($exportSpecificOptions);
         $this->properties = $exportPluginProperties;
@@ -328,6 +328,7 @@ private function _handleNHibernateCSBody($db, $table, $crlf)
     private function _handleNHibernateXMLBody($db, $table, $crlf)
     {
         $lines = array();
+        $common_functions = PMA_CommonFunctions::getInstance();
         $lines[] = '<?xml version="1.0" encoding="utf-8" ?' . '>';
         $lines[] = '<hibernate-mapping xmlns="urn:nhibernate-mapping-2.2" '
             . 'namespace="' . ExportCodegen::cgMakeIdentifier($db) . '" '