gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2012-08-07 13:43:09 +02:00
commit 9a64b5728a
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libraries/plugin_interface.lib.php
View File

@ -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;

1
libraries/plugins/export/ExportOdt.class.php
View File

@ -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');

8
libraries/plugins/export/ExportTexytext.class.php
View File

@ -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;
}
/**