← Back to branch summary

~ubuntu-branches/ubuntu/trusty/phpmyadmin/trusty

« back to all changes in this revision

Viewing changes to libraries/config/setup.forms.php

  • Committer: Package Import Robot
  • Author(s): Thijs Kinkhorst
  • Date: 2013-08-04 13:24:37 UTC
  • mfrom: (1.2.44)
  • Revision ID: package-import@ubuntu.com-20130804132437-jznw8efwy4hr1nms
Tags: 4:4.0.5-1
* New upstream release.
  - Fixes security issue PMASA-2013-10.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libraries/config/setup.forms.php
136
136
    'MemoryLimit',
137
137
    'SkipLockedTables',
138
138
    'DisableMultiTableMaintenance',
139
 
    'UseDbSearch');
 
139
    'UseDbSearch',
 
140
    'AllowThirdPartyFraming');
140
141
$forms['Sql_queries']['Sql_queries'] = array(
141
142
    'ShowSQL',
142
143
    'Confirm',
191
192
$forms['Main_panel']['TableStructure'] = array(
192
193
    'HideStructureActions');
193
194
$forms['Main_panel']['Browse'] = array(
194
 
    'NavigationBarIconic',
 
195
    'TableNavigationLinksMode',
195
196
    'ShowAll',
196
197
    'MaxRows',
197
198
    'Order',
221
222
    'ForeignKeyDropdownOrder',
222
223
    'ForeignKeyMaxLimit');
223
224
$forms['Main_panel']['Tabs'] = array(
224
 
    'PropertiesIconic',
 
225
    'TabsMode',
 
226
    'ActionLinksMode',
225
227
    'DefaultTabServer',
226
228
    'DefaultTabDatabase',
227
229
    'DefaultTabTable',