Skip to content

Commit 2a4eb5a

Browse files
committed
Merge branch 'QA_5_2'
Signed-off-by: Maurício Meneghini Fauth <mauricio@fauth.dev>
2 parents 25cce47 + 2a89325 commit 2a4eb5a

8 files changed

Lines changed: 128 additions & 26 deletions

File tree

ChangeLog

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ phpMyAdmin - ChangeLog
1616
- issue #18120 Fix bug with numerical tables during renaming database
1717
- issue #16851 Fix ($cfg['Order']) default column order doesn't have have any effect since phpMyAdmin 4.2.0
1818
- issue #18112 Fix open base dir warning on git version class
19+
- issue Do not show "Original length undefined" on binary hex columns
1920

2021
5.2.1 (2023-02-07)
2122
- issue #17522 Fix case where the routes cache file is invalid

doc/conf.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,4 @@
315315
r'https://authy.com/.*',
316316
# Site often changes links and reverts changes (9362bde02d0535a2f8cb74a18797249cb734c4b0)
317317
r'https://www.yubico.com/.*',
318-
# Some timeouts and SSL issues: https://github.com/sektioneins/suhosin/issues/119
319-
r'https://suhosin.org/.*',
320318
]

doc/config.rst

Lines changed: 101 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1806,6 +1806,8 @@ Generic settings
18061806
:type: boolean
18071807
:default: true
18081808

1809+
.. versionadded:: 4.5.0
1810+
18091811
Defines whether to use the parser to find any errors in the query before executing.
18101812

18111813
.. config:option:: $cfg['DefaultForeignKeyChecks']
@@ -1894,6 +1896,13 @@ Generic settings
18941896

18951897
.. seealso:: :ref:`faq2_10`
18961898

1899+
.. config:option:: $cfg['maxRowPlotLimit']
1900+
1901+
:type: integer
1902+
:default: 500
1903+
1904+
Maximum number of rows retrieved for zoom search.
1905+
18971906
Cookie authentication options
18981907
-----------------------------
18991908

@@ -1965,7 +1974,7 @@ Cookie authentication options
19651974
* ``Strict``
19661975
* ``None``
19671976

1968-
.. seealso:: `rfc6265 bis <https://tools.ietf.org/id/draft-ietf-httpbis-rfc6265bis-03.html#rfc.section.5.3.7>`_
1977+
.. seealso:: `rfc6265 bis <https://datatracker.ietf.org/doc/html/draft-ietf-httpbis-rfc6265bis-03#section-5.3.7>`_
19691978

19701979
.. config:option:: $cfg['LoginCookieRecall']
19711980
@@ -2389,6 +2398,13 @@ Navigation panel setup
23892398

23902399
Whether to show events under database in the navigation panel.
23912400

2401+
.. config:option:: $cfg['NavigationTreeAutoexpandSingleDb']
2402+
2403+
:type: boolean
2404+
:default: true
2405+
2406+
Whether to expand single database in the navigation tree automatically.
2407+
23922408
.. config:option:: $cfg['NavigationWidth']
23932409
23942410
:type: integer
@@ -2484,6 +2500,20 @@ Main panel
24842500
Database structure
24852501
------------------
24862502

2503+
.. config:option:: $cfg['ShowDbStructureCharset']
2504+
2505+
:type: boolean
2506+
:default: false
2507+
2508+
Defines whether to show a column displaying the charset for all tables in the database structure page.
2509+
2510+
.. config:option:: $cfg['ShowDbStructureComment']
2511+
2512+
:type: boolean
2513+
:default: false
2514+
2515+
Defines whether to show a column displaying the comments for all tables in the database structure page.
2516+
24872517
.. config:option:: $cfg['ShowDbStructureCreation']
24882518
24892519
:type: boolean
@@ -2583,6 +2613,19 @@ Browse mode
25832613
.. versionchanged:: 3.4.0
25842614
Since phpMyAdmin 3.4.0 the default value is ``'SMART'``.
25852615

2616+
.. config:option:: $cfg['DisplayBinaryAsHex']
2617+
2618+
:type: boolean
2619+
:default: true
2620+
2621+
Defines whether the ":guilabel:`Show binary contents as HEX`" browse option is
2622+
ticked by default.
2623+
2624+
.. versionadded:: 3.3.0
2625+
.. deprecated:: 4.3.0
2626+
2627+
This setting was removed.
2628+
25862629
.. config:option:: $cfg['GridEditing']
25872630
25882631
:type: string
@@ -2730,6 +2773,13 @@ Export and import settings
27302773
* ``custom-no-form`` same as ``custom`` but does not display the option
27312774
of using quick export
27322775

2776+
.. config:option:: $cfg['Export']['compression']
2777+
2778+
:type: string
2779+
:default: ``'none'``
2780+
2781+
Default export compression method. Possible values are ``'none'``, ``'zip'`` or ``'gzip'``.
2782+
27332783
.. config:option:: $cfg['Export']['charset']
27342784
27352785
:type: string
@@ -2791,6 +2841,18 @@ Export and import settings
27912841
Defines charset for import. By default no charset conversion is done
27922842
assuming UTF-8.
27932843

2844+
.. config:option:: $cfg['Schema']
2845+
2846+
:type: array
2847+
:default: array(...)
2848+
2849+
.. config:option:: $cfg['Schema']['format']
2850+
2851+
:type: string
2852+
:default: ``'pdf'``
2853+
2854+
Defines the default format for schema export. Possible values are ``'pdf'``, ``'eps'``, ``'dia'`` or ``'svg'``.
2855+
27942856
Tabs display settings
27952857
---------------------
27962858

@@ -3395,11 +3457,49 @@ Various display setting
33953457

33963458
Repeat the headers every X cells, or 0 to deactivate.
33973459

3460+
.. config:option:: $cfg['EditInWindow']
3461+
3462+
:type: boolean
3463+
:default: true
3464+
3465+
.. seealso:: `Feature request to add a pop-up window back <https://github.com/phpmyadmin/phpmyadmin/issues/11983>`_
3466+
3467+
.. deprecated:: 4.3.0
3468+
3469+
This setting was removed.
3470+
3471+
.. config:option:: $cfg['QueryWindowWidth']
3472+
3473+
:type: integer
3474+
:default: 550
3475+
3476+
.. deprecated:: 4.3.0
3477+
3478+
This setting was removed.
3479+
3480+
.. config:option:: $cfg['QueryWindowHeight']
3481+
3482+
:type: integer
3483+
:default: 310
3484+
3485+
.. deprecated:: 4.3.0
3486+
3487+
This setting was removed.
3488+
33983489
.. config:option:: $cfg['QueryHistoryDB']
33993490
34003491
:type: boolean
34013492
:default: false
34023493

3494+
.. config:option:: $cfg['QueryWindowDefTab']
3495+
3496+
:type: string
3497+
:default: ``'sql'``
3498+
3499+
.. deprecated:: 4.3.0
3500+
3501+
This setting was removed.
3502+
34033503
.. config:option:: $cfg['QueryHistoryMax']
34043504
34053505
:type: integer

doc/faq.rst

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -553,41 +553,41 @@ The default values for most Suhosin configuration options will work in
553553
most scenarios, however you might want to adjust at least following
554554
parameters:
555555

556-
* `suhosin.request.max\_vars <https://suhosin.org/stories/configuration.html#suhosin-request-max-vars>`_ should
556+
* `suhosin.request.max\_vars <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-request-max-vars>`_ should
557557
be increased (eg. 2048)
558-
* `suhosin.post.max\_vars <https://suhosin.org/stories/configuration.html#suhosin-post-max-vars>`_ should be
558+
* `suhosin.post.max\_vars <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-post-max-vars>`_ should be
559559
increased (eg. 2048)
560-
* `suhosin.request.max\_array\_index\_length <https://suhosin.org/stories/configuration.html#suhosin-request-max-array-index-length>`_
560+
* `suhosin.request.max\_array\_index\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-request-max-array-index-length>`_
561561
should be increased (eg. 256)
562-
* `suhosin.post.max\_array\_index\_length <https://suhosin.org/stories/configuration.html#suhosin-post-max-array-index-length>`_
562+
* `suhosin.post.max\_array\_index\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-post-max-array-index-length>`_
563563
should be increased (eg. 256)
564-
* `suhosin.request.max\_totalname\_length <https://suhosin.org/stories/configuration.html#suhosin-request-max-totalname-length>`_
564+
* `suhosin.request.max\_totalname\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-request-max-totalname-length>`_
565565
should be increased (eg. 8192)
566-
* `suhosin.post.max\_totalname\_length <https://suhosin.org/stories/configuration.html#suhosin-post-max-totalname-length>`_ should be
566+
* `suhosin.post.max\_totalname\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-post-max-totalname-length>`_ should be
567567
increased (eg. 8192)
568-
* `suhosin.get.max\_value\_length <https://suhosin.org/stories/configuration.html#suhosin-get-max-value-length>`_
568+
* `suhosin.get.max\_value\_length <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-get-max-value-length>`_
569569
should be increased (eg. 1024)
570-
* `suhosin.sql.bailout\_on\_error <https://suhosin.org/stories/configuration.html#suhosin-sql-bailout-on-error>`_
570+
* `suhosin.sql.bailout\_on\_error <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-sql-bailout-on-error>`_
571571
needs to be disabled (the default)
572-
* `suhosin.log.\* <https://suhosin.org/stories/configuration.html#logging-configuration>`_ should not
572+
* `suhosin.log.\* <https://suhosin5.suhosin.org/stories/configuration.html#logging-configuration>`_ should not
573573
include :term:`SQL`, otherwise you get big
574574
slowdown
575-
* `suhosin.sql.union <https://suhosin.org/stories/configuration.html#suhosin-
575+
* `suhosin.sql.union <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-
576576
sql-union>`_ must be disabled (which is the default).
577-
* `suhosin.sql.multiselect <https://suhosin.org/stories/configuration.html#
577+
* `suhosin.sql.multiselect <https://suhosin5.suhosin.org/stories/configuration.html#
578578
suhosin-sql-multiselect>`_ must be disabled (which is the default).
579-
* `suhosin.sql.comment <https://suhosin.org/stories/configuration.html#suhosin-
579+
* `suhosin.sql.comment <https://suhosin5.suhosin.org/stories/configuration.html#suhosin-
580580
sql-comment>`_ must be disabled (which is the default).
581581

582582
To further improve security, we also recommend these modifications:
583583

584-
* `suhosin.executor.include.max\_traversal <https://suhosin.org/stories/
584+
* `suhosin.executor.include.max\_traversal <https://suhosin5.suhosin.org/stories/
585585
configuration.html#suhosin-executor-include-max-traversal>`_ should be
586586
enabled as a mitigation against local file inclusion attacks. We suggest
587587
setting this to 2 as ``../`` is used with the ReCaptcha library.
588-
* `suhosin.cookie.encrypt <https://suhosin.org/stories/configuration.html#
588+
* `suhosin.cookie.encrypt <https://suhosin5.suhosin.org/stories/configuration.html#
589589
suhosin-cookie-encrypt>`_ should be enabled.
590-
* `suhosin.executor.disable_emodifier <https://suhosin.org/stories/config
590+
* `suhosin.executor.disable_emodifier <https://suhosin5.suhosin.org/stories/config
591591
uration.html#suhosin-executor-disable-emodifier>`_ should be enabled.
592592

593593
You can also disable the warning using the :config:option:`$cfg['SuhosinDisableWarning']`.
@@ -851,8 +851,8 @@ Here are a few points to check:
851851
Dorninger for the hint).
852852
* In the :file:`php.ini` directive ``arg_separator.input``, a value of ";"
853853
will cause this error. Replace it with "&;".
854-
* If you are using `Suhosin <https://suhosin.org/stories/index.html>`_, you
855-
might want to increase `request limits <https://suhosin.org/stories/faq.html>`_.
854+
* If you are using `Suhosin <https://suhosin5.suhosin.org/stories/index.html>`_, you
855+
might want to increase `request limits <https://suhosin5.suhosin.org/stories/faq.html>`_.
856856
* The directory specified in the :file:`php.ini` directive
857857
``session.save_path`` does not exist or is read-only (this can be caused
858858
by `bug in the PHP installer <https://bugs.php.net/bug.php?id=39842>`_).

doc/setup.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Red Hat Enterprise Linux
6767

6868
Red Hat Enterprise Linux itself and thus derivatives like CentOS don't
6969
ship phpMyAdmin, but the Fedora-driven repository
70-
`Extra Packages for Enterprise Linux (EPEL) <https://fedoraproject.org/wiki/EPEL>`_
70+
`Extra Packages for Enterprise Linux (EPEL) <https://docs.fedoraproject.org/en-US/epel/>`_
7171
is doing so, if it's
7272
`enabled <https://fedoraproject.org/wiki/EPEL/FAQ#howtouse>`_.
7373
But be aware that the configuration file is maintained in

doc/two_factor.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ There are several manufacturers of these tokens, for example:
5353

5454
* `youbico FIDO U2F Security Key <https://www.yubico.com/fido-u2f/>`_
5555
* `HyperFIDO <https://www.hypersecu.com/hyperfido>`_
56-
* `Trezor Hardware Wallet <https://trezor.io/?offer_id=12&aff_id=1592&source=phpmyadmin>`_ can act as an `U2F token <https://wiki.trezor.io/User_manual:Two-factor_Authentication_with_U2F>`_
57-
* `List of Two Factor Auth (2FA) Dongles <https://www.dongleauth.info/dongles/>`_
56+
* `Trezor Hardware Wallet <https://trezor.io/?offer_id=12&aff_id=1592&source=phpmyadmin>`_ can act as an `U2F token <https://trezor.io/learn/a/what-is-u2f>`_
57+
* `List of Two Factor Auth (2FA) Dongles <https://www.dongleauth.com/dongles/>`_
5858

5959
.. _simple2fa:
6060

doc/vendors.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ Specific files LICENSES
3636

3737
phpMyAdmin distributed themes contain some content that is under licenses.
3838

39-
- The icons of the `Original` and `pmahomme` themes are from the `Silk Icons <http://www.famfamfam.com/lab/icons/silk/>`_.
40-
- Some icons of the `Metro` theme are from the `Silk Icons <http://www.famfamfam.com/lab/icons/silk/>`_.
39+
- The icons of the `Original` and `pmahomme` themes are from the `Silk Icons <https://web.archive.org/web/20221201060206/http://www.famfamfam.com/lab/icons/silk/>`_.
40+
- Some icons of the `Metro` theme are from the `Silk Icons <https://web.archive.org/web/20221201060206/http://www.famfamfam.com/lab/icons/silk/>`_.
4141
- `themes/*/img/b_rename.svg` Is a `Icons8 <https://thenounproject.com/Icons8/>`_, icon from the `Android L Icon Pack Collection <https://thenounproject.com/Icons8/collection/android-l-icon-pack/>`_. The icon `rename <https://thenounproject.com/term/rename/61456/>`_.
4242
- `themes/metro/img/user.svg` Is a IcoMoon the `user <https://github.com/Keyamoon/IcoMoon-Free/blob/master/SVG/114-user.svg>`_
4343

@@ -46,6 +46,6 @@ CC BY 4.0 or GPL
4646
Licenses for vendors
4747
--------------------
4848

49-
- Silk Icons are under the `CC BY 2.5 or CC BY 3.0 <http://www.famfamfam.com/lab/icons/silk/>`_ licenses.
49+
- Silk Icons are under the `CC BY 2.5 or CC BY 3.0 <https://web.archive.org/web/20221201060206/http://www.famfamfam.com/lab/icons/silk/>`_ licenses.
5050
- `rename` from `Icons8` is under the `"public domain" <https://creativecommons.org/publicdomain/zero/1.0/>`_ (CC0 1.0) license.
5151
- IcoMoon Free is under `"CC BY 4.0 or GPL" <https://github.com/Keyamoon/IcoMoon-Free/blob/master/License.txt>`_.

js/src/makegrid.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2184,6 +2184,9 @@ window.makeGrid = function (t, enableResize, enableReorder, enableVisib, enableG
21842184
// wrap all truncated data cells with span indicating the original length
21852185
// todo update the original length after a grid edit
21862186
$(t).find('td.data.truncated:not(:has(span))')
2187+
.filter(function () {
2188+
return $(this).data('originallength') !== undefined;
2189+
})
21872190
.wrapInner(function () {
21882191
return '<span title="' + window.Messages.strOriginalLength + ' ' +
21892192
$(this).data('originallength') + '"></span>';

0 commit comments

Comments
 (0)