The branch, master has been updated
via 42f04d4a7ece376c57d3c7a717e24bbcc6621425 (commit)
from aa4536371980e7c8144505f1a74cff658178fc8c (commit)
- Log -----------------------------------------------------------------
commit 42f04d4a7ece376c57d3c7a717e24bbcc6621425
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 14:49:38 2010 +0200
Avoid precalculating counts.
The count() on array is cheap in PHP and having hardcoded numbers only
tends to break.
-----------------------------------------------------------------------
Summary of changes:
libraries/sqlparser.data.php | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index b0b06c2..8f0c140 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -338,7 +338,7 @@ $PMA_SQPdata_function_name = array (
*
* @global integer MySQL attributes count
*/
-$PMA_SQPdata_function_name_cnt = 299;
+$PMA_SQPdata_function_name_cnt = count($PMA_SQPdata_function_name);
/*
* DEBUG
@@ -391,7 +391,7 @@ $PMA_SQPdata_column_attrib = array (
*
* @global integer MySQL attributes count
*/
-$PMA_SQPdata_column_attrib_cnt = 30;
+$PMA_SQPdata_column_attrib_cnt = count($PMA_SQPdata_column_attrib);
/**
* words that are reserved by MySQL and may not be used as identifiers without quotes
@@ -698,7 +698,7 @@ $PMA_SQPdata_reserved_word = array (
*
* @global integer MySQL reserved words count
*/
-$PMA_SQPdata_reserved_word_cnt = 289;
+$PMA_SQPdata_reserved_word_cnt = count($PMA_SQPdata_reserved_word);
/**
* The previous array must be sorted so that the binary search work.
* Sometimes a word is not added in the correct order, so
@@ -1213,7 +1213,7 @@ $PMA_SQPdata_forbidden_word = array (
*
* @global integer MySQL forbidden words count
*/
-$PMA_SQPdata_forbidden_word_cnt = 483;
+$PMA_SQPdata_forbidden_word_cnt = count($PMA_SQPdata_forbidden_word);
/**
* the MySQL column/data types
@@ -1284,7 +1284,7 @@ $PMA_SQPdata_column_type = array (
*
* @global integer MySQL column types count
*/
-$PMA_SQPdata_column_type_cnt = 54;
+$PMA_SQPdata_column_type_cnt = count($PMA_SQPdata_column_type);
/*
* check counts
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via aa4536371980e7c8144505f1a74cff658178fc8c (commit)
via 0d1b51576967ecbd1f771e1387e2ba1bd29fb799 (commit)
via 617b01499c5aee7f212207b0ca928875df22b175 (commit)
from d304002fc0bf75efe1f714d5a5cca91287528cd3 (commit)
- Log -----------------------------------------------------------------
commit aa4536371980e7c8144505f1a74cff658178fc8c
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 14:38:37 2010 +0200
Correct count of words.
commit 0d1b51576967ecbd1f771e1387e2ba1bd29fb799
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 14:29:00 2010 +0200
Fixed detection of ods_col_names (bug #3056017).
commit 617b01499c5aee7f212207b0ca928875df22b175
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 14:28:06 2010 +0200
Fix typo.
-----------------------------------------------------------------------
Summary of changes:
libraries/import/ods.php | 2 +-
libraries/sqlparser.data.php | 2 +-
po/cs.po | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/libraries/import/ods.php b/libraries/import/ods.php
index 7df7edc..c0db7af 100644
--- a/libraries/import/ods.php
+++ b/libraries/import/ods.php
@@ -90,7 +90,7 @@ $rows = array();
/* Iterate over tables */
foreach ($sheets as $sheet) {
- $col_names_in_first_row = $_REQUEST['ods_col_names'];
+ $col_names_in_first_row = isset($_REQUEST['ods_col_names']);
/* Iterate over rows */
foreach ($sheet as $row) {
diff --git a/libraries/sqlparser.data.php b/libraries/sqlparser.data.php
index 8af6458..b0b06c2 100644
--- a/libraries/sqlparser.data.php
+++ b/libraries/sqlparser.data.php
@@ -698,7 +698,7 @@ $PMA_SQPdata_reserved_word = array (
*
* @global integer MySQL reserved words count
*/
-$PMA_SQPdata_reserved_word_cnt = 291;
+$PMA_SQPdata_reserved_word_cnt = 289;
/**
* The previous array must be sorted so that the binary search work.
* Sometimes a word is not added in the correct order, so
diff --git a/po/cs.po b/po/cs.po
index c350a27..079553c 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -5384,7 +5384,7 @@ msgstr "MySQL vrátil prázdný výsledek (tj. nulový počet řádků)."
#: libraries/import.lib.php:1110
msgid ""
"The following structures have either been created or altered. Here you can:"
-msgstr "Následující tabulkybyly vytvořeny nebo změněny. Teď můžete:"
+msgstr "Následující tabulky byly vytvořeny nebo změněny. Teď můžete:"
#: libraries/import.lib.php:1111
msgid "View a structure`s contents by clicking on its name"
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via d304002fc0bf75efe1f714d5a5cca91287528cd3 (commit)
from fdb0d32df4008633cc39a6846211a14611711d25 (commit)
- Log -----------------------------------------------------------------
commit d304002fc0bf75efe1f714d5a5cca91287528cd3
Author: ninadsp <ninadsp16289(a)gmail.com>
Date: Mon Aug 30 00:24:33 2010 +0530
Re-initialize for each data field. It was being cleared in a BLOB field, which caused inline editing to fail for all further fields in that row
-----------------------------------------------------------------------
Summary of changes:
libraries/display_tbl.lib.php | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 26144e0..16ac8c9 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -1076,7 +1076,6 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
|| $_SESSION['tmp_user_values']['disp_direction'] == 'horizontalflipped') {
// pointer code part
echo ' <tr class="' . $class . '">' . "\n";
- $class = $data_inline_edit_class;
}
@@ -1204,6 +1203,9 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) {
$meta = $fields_meta[$i];
$pointer = $i;
$is_field_truncated = false;
+ //If the previous column had blob data, we need to reset the class
+ // to $data_inline_edit_class
+ $class = $data_inline_edit_class;
//If this column's value is null, add the null class to it, needed
//for inline editing
if(is_null($row[$i])) {
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 411844233d9a82c52d60c0fffcf53ba455e5bf3c (commit)
from 7f1b1df69f3ded0025d5df5cfcf720caf8644a8c (commit)
- Log -----------------------------------------------------------------
commit 411844233d9a82c52d60c0fffcf53ba455e5bf3c
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 11:22:29 2010 +0200
Czech translation update.
-----------------------------------------------------------------------
Summary of changes:
po/cs.po | 27 ++++++++++++++++++++++-----
1 files changed, 22 insertions(+), 5 deletions(-)
diff --git a/po/cs.po b/po/cs.po
index d4d17c9..c350a27 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: phpMyAdmin 3.4.0-dev\n"
"Report-Msgid-Bugs-To: phpmyadmin-devel(a)lists.sourceforge.net\n"
"POT-Creation-Date: 2010-08-27 16:16+0200\n"
-"PO-Revision-Date: 2010-08-27 13:41+0200\n"
+"PO-Revision-Date: 2010-08-30 11:22+0200\n"
"Last-Translator: Michal Čihař <michal(a)cihar.com>\n"
"Language-Team: czech <cs(a)li.org>\n"
"Language: cs\n"
@@ -2088,6 +2088,9 @@ msgid ""
"inside a frame, and is a potential [strong]security hole[/strong] allowing "
"cross-frame scripting attacks"
msgstr ""
+"Toto nastavení umožňuje stránkám na jiných doménách začlenit phpMyAdmina do "
+"rámce, toto je potenciální [strong]bezpečnostní problém[/strong] a může "
+"umožnit XFS (Cross Frame Scripting)."
#: libraries/config/messages.inc.php:20
msgid "Allow third party framing"
@@ -2672,6 +2675,8 @@ msgid ""
"html#cfg_TitleTable]documentation[/a] for magic strings that can be used to "
"get special values."
msgstr ""
+"Zadejte titulek který zobrazí prohlížeč. V [a@Documentation."
+"html#cfg_TitleTable]dokumentaci[/a] naleznete jaké proměnné můžete použít."
#: libraries/config/messages.inc.php:189
#: libraries/navigation_header.inc.php:83
@@ -3153,6 +3158,8 @@ msgid ""
"Disable the default warning that is displayed if mcrypt is missing for "
"cookie authentication"
msgstr ""
+"Vypne varování o chybějícím rozšíření mcrypt při použití přihlašování přes "
+"cookies"
#: libraries/config/messages.inc.php:308
msgid "mcrypt warning"
@@ -3227,7 +3234,7 @@ msgid ""
"Disable the default warning that is displayed on the database details "
"Structure page if any of the required tables for the relation features could "
"not be found"
-msgstr ""
+msgstr "Vypne varování o nekompletních relacích na stránce s detaily databáze"
#: libraries/config/messages.inc.php:324
msgid "Missing phpMyAdmin configuration storage tables"
@@ -3906,6 +3913,8 @@ msgid ""
"If you have a custom username, specify it here (defaults to [kbd]anonymous[/"
"kbd])"
msgstr ""
+"Pokud máte vlastní užvatelské jméno, zadejte ho zde (jinak se použije [kbd]"
+"anonymous[/kbd])"
#: libraries/config/messages.inc.php:467 tbl_tracking.php:405
#: tbl_tracking.php:456
@@ -4010,6 +4019,8 @@ msgid ""
"When disabled, users cannot set any of the options below, regardless of the "
"checkbox on the right"
msgstr ""
+"Pokud je vypnuto, uživatelé nemůžou změnit žádná z níže uvedených nastavení, "
+"bez ohledu na zaškrtávátko napravo"
#: libraries/config/messages.inc.php:491
msgid "Enable the Developer tab in settings"
@@ -4351,15 +4362,15 @@ msgstr "Šablona pro jméno souboru:"
#: libraries/display_export.lib.php:229
msgid "@SERVER@ will become the server name"
-msgstr ""
+msgstr "@SERVER@ bude nahrazen jménem server"
#: libraries/display_export.lib.php:231
msgid ", @DATABASE@ will become the database name"
-msgstr ""
+msgstr ", @DATABASE@ bude nahrazen jménem databáze"
#: libraries/display_export.lib.php:233
msgid ", @TABLE@ will become the table name"
-msgstr ""
+msgstr ", @TABLE@ bude nahrazen jménem tabulky"
#: libraries/display_export.lib.php:237
#, php-format
@@ -5215,6 +5226,7 @@ msgstr ""
msgid ""
"Database system or older MySQL server to maximize output compatibility with:"
msgstr ""
+"Datázový systém nebo starší verze MySQL se kterým má být výstup kompatibilní:"
#: libraries/export/sql.php:72 libraries/export/sql.php:105
#: libraries/export/sql.php:107
@@ -9049,12 +9061,17 @@ msgstr ""
msgid ""
"When drawing a radar chart all values are normalized to a range [0..10]."
msgstr ""
+"Při kreslení síťového grafu jsou všechny hodnoty normalizovány do rozsahu "
+"[0..10]."
#: tbl_chart.php:174
msgid ""
"Note that not every result table can be put to the chart. See <a href=\"./"
"Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a>"
msgstr ""
+"Ne každý výsledek SQL dotazu je možné zobrazit v grafu. Ve <a href=\"./"
+"Documentation.html#faq6_29\" target=\"Documentation\">FAQ 6.29</a> naleznete "
+"více podrobností."
#: tbl_chart.php:182
msgid "Redraw"
hooks/post-receive
--
phpMyAdmin
The branch, master has been updated
via 7f1b1df69f3ded0025d5df5cfcf720caf8644a8c (commit)
via bf8a597d78c7314523b388539113996e47a141a5 (commit)
from 0c7e5b3f758607f43ab563738559bc2cd96b5641 (commit)
- Log -----------------------------------------------------------------
commit 7f1b1df69f3ded0025d5df5cfcf720caf8644a8c
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 11:01:31 2010 +0200
[core] Remove last remaining parts of profiling code which was removed in 2006.
commit bf8a597d78c7314523b388539113996e47a141a5
Author: Michal Čihař <mcihar(a)novell.com>
Date: Mon Aug 30 10:54:17 2010 +0200
Remove dead code.
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 1 +
Documentation.html | 24 --------------------
libraries/config.default.php | 23 --------------------
libraries/config/messages.inc.php | 1 -
libraries/config/setup.forms.php | 5 +--
libraries/config/user_preferences.forms.php | 5 +--
libraries/dbg/setup.php | 31 ---------------------------
libraries/footer.inc.php | 29 -------------------------
libraries/user_preferences.inc.php | 15 -------------
libraries/user_preferences.lib.php | 3 +-
10 files changed, 6 insertions(+), 131 deletions(-)
delete mode 100644 libraries/dbg/setup.php
diff --git a/ChangeLog b/ChangeLog
index 03197d8..944449a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -111,6 +111,7 @@ $Id$
- rfe #806035, #686260 [relations] Export relations to Dia, SVG and others
+ [interface] Added charts to status tab, profiling page and query results
+ [interface] AJAXification on various pages
+- [core] Remove last remaining parts of profiling code which was removed in 2006.
3.3.7.0 (not yet released)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
diff --git a/Documentation.html b/Documentation.html
index 2ee298b..5a31aed 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2274,30 +2274,6 @@ setfacl -d -m "g:www-data:rwx" tmp
Enable logging queries and execution times to be displayed in the bottom
of main page (right frame).</dd>
- <dt id="cfg_DBG_enable_php">$cfg['DBG']['php'] boolean</dt>
- <dd><b>DEVELOPERS ONLY!</b><br />
- Enable the DBG extension for debugging phpMyAdmin. Required for profiling
- the code.<br />
- For help in setting up your system to this, see the
- <a href="#developersdbg">Developers</a> section.</dd>
-
- <dt id="cfg_DBG_profile_enable">$cfg['DBG']['profile']['enable'] boolean</dt>
- <dd><b>DEVELOPERS ONLY!</b><br />
- Enable profiling support for phpMyAdmin. This will append a chunk of data
- to the end of every page displayed in the main window with profiling
- statistics for that page.<br />
- You may need to increase the maximum execution time for this to
- complete successfully.<i>Profiling was removed from the code for
- version 2.9.0 due to licensing issues.</i></dd>
-
- <dt id="cfg_DBG_profile_threshold">$cfg['DBG']['profile']['threshold'] float (units in milliseconds)</dt>
- <dd><b>DEVELOPERS ONLY!</b><br />
- When profiling data is displayed, this variable controls the threshold of
- display for any profiling data, based on the average time each time has
- taken. If it is over the threshold it is displayed, otherwise it is not
- displayed. This takes a value in milliseconds. In most cases you don't need
- to edit this.</dd>
-
<dt id="cfg_ColumnTypes">$cfg['ColumnTypes'] array</dt>
<dd>All possible types of a MySQL column. In most cases you don't need to
edit this.</dd>
diff --git a/libraries/config.default.php b/libraries/config.default.php
index b637e58..466dc2c 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2653,29 +2653,6 @@ $cfg['DBG'] = array();
*/
$cfg['DBG']['sql'] = false;
-/**
- * Make the DBG stuff available
- * To use the following, please install the DBG extension from http://dd.cron.ru/dbg/
- *
- * @global boolean $cfg['DBG']['php']
- */
-$cfg['DBG']['php'] = false;
-
-/**
- * Produce profiling results of PHP
- *
- * @global boolean $cfg['DBG']['profile']['enable']
- */
-$cfg['DBG']['profile']['enable'] = false;
-
-/**
- * Threshold of long running code to display
- * Anything below the threshold is not displayed
- *
- * @global float $cfg['DBG']['profile']['threshold']
- */
-$cfg['DBG']['profile']['threshold'] = 0.5;
-
/*******************************************************************************
* MySQL settings
diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index a771ee6..33a4f31 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -40,7 +40,6 @@ $strConfigConfigurationFile = __('Configuration file');
$strConfigConfirm_desc = __('Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data');
$strConfigConfirm_name = __('Confirm DROP queries');
$strConfigCtrlArrowsMoving_name = __('Field navigation using Ctrl+Arrows');
-$strConfigDBG_php_name = __('Debug PHP');
$strConfigDBG_sql_name = __('Debug SQL');
$strConfigDefaultDisplay_name = __('Default display direction');
$strConfigDefaultPropDisplay_desc = __('[kbd]horizontal[/kbd], [kbd]vertical[/kbd] or a number that indicates maximum number for which vertical model is used');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index ebaaf27..48d195a 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -118,8 +118,7 @@ $forms['Features']['Developer'] = array(
'UserprefsDeveloperTab',
'Error_Handler/display',
'Error_Handler/gather',
- 'DBG/sql',
- 'DBG/php');
+ 'DBG/sql');
$forms['Features']['Other_core_settings'] = array(
'NaturalOrder',
'InitialSlidersState',
@@ -370,4 +369,4 @@ $forms['Export']['Texy'] = array('Export' => array(
':group:' . __('Data'),
'texytext_null',
'texytext_columns'));
-?>
\ No newline at end of file
+?>
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 3f4814f..a82a351 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -51,8 +51,7 @@ $forms['Features']['Warnings'] = array(
$forms['Features']['Developer'] = array(
'Error_Handler/display',
'Error_Handler/gather',
- 'DBG/sql',
- 'DBG/php');
+ 'DBG/sql');
$forms['Sql_queries']['Sql_queries'] = array(
'ShowSQL',
'Confirm',
@@ -272,4 +271,4 @@ $forms['Export']['Texy'] = array(
':group:' . __('Data'),
'Export/texytext_null',
'Export/texytext_columns');
-?>
\ No newline at end of file
+?>
diff --git a/libraries/dbg/setup.php b/libraries/dbg/setup.php
deleted file mode 100644
index 7b80ce2..0000000
--- a/libraries/dbg/setup.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/* vim: set expandtab sw=4 ts=4 sts=4: */
-/**
- * @package phpMyAdmin-DBG
- */
-if (! defined('PHPMYADMIN')) {
- exit;
-}
-
-/**
- * checks for DBG extension
- *
- * allways use $GLOBALS here, as this script is included by footer.inc.hp
- * which can also be included from inside a function
- */
-if ($GLOBALS['cfg']['DBG']['php']) {
- /**
- * Loads the DBG extension if needed
- */
- if (! @extension_loaded('dbg') ) {
- $message = PMA_Message::error(__('The %s extension is missing. Please check your PHP configuration.'),
- $message->addParam(sprintf('[a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]', 'dbg'));
- $message->addMessage('<a href="./Documentation.html#faqdbg" target="documentation">', false);
- $message->addString(__('Documentation'));
- $message->addMessage('</a>', false);
- $message->display();
- } else {
- $GLOBALS['DBG'] = true;
- }
-}
-?>
diff --git a/libraries/footer.inc.php b/libraries/footer.inc.php
index 7e01216..f5e6e98 100644
--- a/libraries/footer.inc.php
+++ b/libraries/footer.inc.php
@@ -29,8 +29,6 @@
* @uses $GLOBALS['userlink'] to close it
* @uses $cfg['Server']['user']
* @uses $cfg['NavigationBarIconic']
- * @uses $cfg['DBG']['enable']
- * @uses $cfg['DBG']['profile']['enable']
* @uses $cfg['MaxCharactersInDisplayedSQL']
* @uses PMA_isValid()
* @uses PMA_setHistory()
@@ -186,14 +184,6 @@ setURLHash("<?php echo PMA_generate_common_url($url_params, 'text', ''); ?>");
echo '<a href="index.php' . PMA_generate_common_url($url_params) . '"'
. ' title="' . __('Open new phpMyAdmin window') . '" target="_blank">';
- /*
- echo '<a href="index.php?target=' . basename(PMA_getenv('SCRIPT_NAME'));
- $url = PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']);
- if (!empty($url)) {
- echo '&' . $url;
- }
- echo '" target="_blank">';
- */
if ($GLOBALS['cfg']['NavigationBarIconic']) {
echo '<img class="icon" src="'. $GLOBALS['pmaThemeImage'] . 'window-new.png"'
. ' alt="' . __('Open new phpMyAdmin window') . '" />';
@@ -210,25 +200,6 @@ if (! $GLOBALS['is_ajax_request'] && file_exists(CUSTOM_FOOTER_FILE)) {
require CUSTOM_FOOTER_FILE;
}
-
-/**
- * Generates profiling data if requested
- */
-
-// profiling deactivated due to licensing issues
-if (! empty($GLOBALS['cfg']['DBG']['php'])
- && ! empty($GLOBALS['cfg']['DBG']['profile']['enable'])) {
- //run the basic setup code first
- require_once './libraries/dbg/setup.php';
- //if the setup ran fine, then do the profiling
- /*
- if (! empty($GLOBALS['DBG'])) {
- require_once './libraries/dbg/profiling.php';
- dbg_dump_profiling_results();
- }
- */
-}
-
/**
* If we are in an AJAX request, we do not need to generate the closing tags for
* body and html.
diff --git a/libraries/user_preferences.inc.php b/libraries/user_preferences.inc.php
index b86e4a1..e173d55 100644
--- a/libraries/user_preferences.inc.php
+++ b/libraries/user_preferences.inc.php
@@ -48,21 +48,6 @@ if (!empty($_GET['saved'])) {
$message->display();
}
-// debug info
-if ($cfg['DBG']['php']) {
- $arr = ConfigFile::getInstance()->getConfigArray();
- $arr2 = array();
- foreach ($arr as $k => $v) {
- $arr2[] = "<b>$k</b> " . var_export($v, true);
- }
- $arr2 = implode(', ', $arr2);
- $arr2 .= '<br />Blacklist: ' . (empty($cfg['UserprefsDisallow'])
- ? '<i>empty</i>'
- : implode(', ', $cfg['UserprefsDisallow']));
- $msg = PMA_Message::notice('Settings: ' . $arr2);
- $msg->display();
-}
-
// warn about using session storage for settings
$cfgRelation = PMA_getRelationsParam();
if (!$cfgRelation['userconfigwork']) {
diff --git a/libraries/user_preferences.lib.php b/libraries/user_preferences.lib.php
index c513a19..bf84b25 100644
--- a/libraries/user_preferences.lib.php
+++ b/libraries/user_preferences.lib.php
@@ -164,7 +164,6 @@ function PMA_apply_userprefs(array $config_data)
$blacklist['Error_Handler/display'] = true;
$blacklist['Error_Handler/gather'] = true;
$blacklist['DBG/sql'] = true;
- $blacklist['DBG/php'] = true;
}
$whitelist = array_flip(PMA_read_userprefs_fieldnames());
// whitelist some additional fields which are custom handled
@@ -313,4 +312,4 @@ function PMA_userprefs_autoload_header()
</div>
<?php
}
-?>
\ No newline at end of file
+?>
hooks/post-receive
--
phpMyAdmin