Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin into server_refactor2
This commit is contained in:
xmujay
commit
ede195c42b
@ -25,7 +25,9 @@ phpMyAdmin - ChangeLog
|
||||
- [core] Dropped support for PHP 5.2.
|
||||
+ rfe #487 and rfe #1405 Find and Replacing column wise
|
||||
+ rfe #1373 Use same create view dialog for editing a view
|
||||
+ rfe #316 Configurable menus; allow user groups with customized menus per group- bug #4024 Editing field a record is selected by makes pma load forever
|
||||
+ rfe #316 Configurable menus; allow user groups with customized menus per group
|
||||
- bug #4024 Editing field a record is selected by makes pma load forever
|
||||
- bug #4035 Query "inline" link disappears when turning off "Explain SQL" option
|
||||
|
||||
4.0.5.0 (not yet released)
|
||||
- bug #3977 Not detected configuration storage
|
||||
@ -40,6 +42,9 @@ phpMyAdmin - ChangeLog
|
||||
- bug #4019 Create database if not exists (export): add an option to the
|
||||
interface to enable generating CREATE DATABASE and USE (false by default)
|
||||
- bug #4012 Crash on CSV file import
|
||||
- bug #4009 Statistic Monitor shows only last 3 digits in graph
|
||||
- bug #3998 Non-permanent SQL history not working
|
||||
- bug #3578 Transformations for text/plain on a BLOB column
|
||||
|
||||
4.0.4.1 (2013-06-30)
|
||||
- [security] Global variables scope injection vulnerability (see PMASA-2013-7)
|
||||
|
||||
@ -5445,7 +5445,9 @@ class PMA_DisplayResults
|
||||
$result .= ']';
|
||||
|
||||
if (gettype($transformation_plugin) == "object"
|
||||
&& strpos($transformation_plugin->getMIMESubtype(), 'Octetstream')
|
||||
&& (strpos($transformation_plugin->getMIMESubtype(), 'Octetstream')
|
||||
// if we want to use a text transformation on a BLOB column
|
||||
|| strpos($transformation_plugin->getMIMEtype(), 'Text') !== false)
|
||||
) {
|
||||
$result = $content;
|
||||
}
|
||||
|
||||
@ -1210,7 +1210,7 @@ class PMA_Util
|
||||
// but only explain a SELECT (that has not been explained)
|
||||
/* SQL-Parser-Analyzer */
|
||||
$explain_link = '';
|
||||
$is_select = false;
|
||||
$is_select = preg_match('@^SELECT[[:space:]]+@i', $sql_query);
|
||||
if (! empty($cfg['SQLQuery']['Explain']) && ! $query_too_big) {
|
||||
$explain_params = $url_params;
|
||||
// Detect if we are validating as well
|
||||
@ -1218,10 +1218,9 @@ class PMA_Util
|
||||
if (! empty($GLOBALS['validatequery'])) {
|
||||
$explain_params['validatequery'] = 1;
|
||||
}
|
||||
if (preg_match('@^SELECT[[:space:]]+@i', $sql_query)) {
|
||||
if ($is_select) {
|
||||
$explain_params['sql_query'] = 'EXPLAIN ' . $sql_query;
|
||||
$_message = __('Explain SQL');
|
||||
$is_select = true;
|
||||
} elseif (
|
||||
preg_match(
|
||||
'@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i', $sql_query
|
||||
@ -4280,11 +4279,6 @@ class PMA_Util
|
||||
);
|
||||
}
|
||||
}
|
||||
curl_setopt(
|
||||
$curl_handle,
|
||||
CURLOPT_RETURNTRANSFER,
|
||||
1
|
||||
);
|
||||
curl_setopt(
|
||||
$curl_handle,
|
||||
CURLOPT_HEADER,
|
||||
|
||||
@ -905,6 +905,14 @@ function PMA_getHistory($username)
|
||||
{
|
||||
$cfgRelation = PMA_getRelationsParam();
|
||||
|
||||
/**
|
||||
* if db-based history is disabled but there exists a session-based
|
||||
* history, use it
|
||||
*/
|
||||
if (! $GLOBALS['cfg']['QueryHistoryDB'] && isset($_SESSION['sql_history'])) {
|
||||
return array_reverse($_SESSION['sql_history']);
|
||||
}
|
||||
|
||||
if (! $cfgRelation['historywork']) {
|
||||
return false;
|
||||
}
|
||||
|
||||
@ -10,7 +10,7 @@ if (!defined('PHPMYADMIN')) {
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the database name inside a USE query
|
||||
* Get the database name inside a query
|
||||
*
|
||||
* @param string $sql SQL query
|
||||
* @param array $databases array with all databases
|
||||
@ -23,7 +23,7 @@ function PMA_getNewDatabase($sql, $databases)
|
||||
// loop through all the databases
|
||||
foreach ($databases as $database) {
|
||||
if (strpos($sql, $database['SCHEMA_NAME']) !== false) {
|
||||
$db = $database;
|
||||
$db = $database['SCHEMA_NAME'];
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@ -13,19 +13,8 @@ PMA_Response::getInstance()->disable();
|
||||
|
||||
require_once 'libraries/pmd_common.php';
|
||||
|
||||
$post_params = array(
|
||||
'T',
|
||||
'F'
|
||||
);
|
||||
|
||||
foreach ($post_params as $one_post_param) {
|
||||
if (isset($_POST[$one_post_param])) {
|
||||
$GLOBALS[$one_post_param] = $_POST[$one_post_param];
|
||||
}
|
||||
}
|
||||
|
||||
$table = $T;
|
||||
$display_field = $F;
|
||||
$table = $_POST['T'];
|
||||
$display_field = $_POST['F'];
|
||||
|
||||
if ($cfgRelation['displaywork']) {
|
||||
|
||||
|
||||
12
po/hr.po
12
po/hr.po
@ -4,8 +4,8 @@ msgstr ""
|
||||
"Project-Id-Version: phpMyAdmin 4.1-dev\n"
|
||||
"Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
|
||||
"POT-Creation-Date: 2013-07-12 16:06+0200\n"
|
||||
"PO-Revision-Date: 2013-07-15 11:29+0200\n"
|
||||
"Last-Translator: Michal Čihař <michal@cihar.com>\n"
|
||||
"PO-Revision-Date: 2013-07-26 11:41+0200\n"
|
||||
"Last-Translator: Tomislav Novak <fritex@fritexdesigns.com>\n"
|
||||
"Language-Team: Croatian "
|
||||
"<http://l10n.cihar.com/projects/phpmyadmin/master/hr/>\n"
|
||||
"Language: hr\n"
|
||||
@ -14,7 +14,7 @@ msgstr ""
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
|
||||
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
|
||||
"X-Generator: Weblate 1.6-dev\n"
|
||||
"X-Generator: Weblate 1.6\n"
|
||||
|
||||
#: browse_foreigners.php:51 browse_foreigners.php:75 js/messages.php:339
|
||||
#: libraries/DisplayResults.class.php:813
|
||||
@ -42,10 +42,9 @@ msgstr ""
|
||||
"za blokiranje ažuriranja preko više prozora."
|
||||
|
||||
#: browse_foreigners.php:182
|
||||
#, fuzzy
|
||||
#| msgid "Search"
|
||||
msgid "Search:"
|
||||
msgstr "Traži"
|
||||
msgstr "Pretraživanje:"
|
||||
|
||||
#: browse_foreigners.php:186 gis_data_editor.php:396 js/messages.php:209
|
||||
#: libraries/DbSearch.class.php:455 libraries/DisplayResults.class.php:1653
|
||||
@ -123,10 +122,9 @@ msgstr "Komentar baze podataka: "
|
||||
|
||||
#: db_datadict.php:157 libraries/schema/Pdf_Relation_Schema.class.php:1345
|
||||
#: libraries/tbl_columns_definition_form.inc.php:836 tbl_printview.php:120
|
||||
#, fuzzy
|
||||
#| msgid "Table comments"
|
||||
msgid "Table comments:"
|
||||
msgstr "Komentari tablice"
|
||||
msgstr "Komentari tablice:"
|
||||
|
||||
#: db_datadict.php:166 libraries/Index.class.php:565
|
||||
#: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1233
|
||||
|
||||
1
themes/.gitignore
vendored
1
themes/.gitignore
vendored
@ -14,6 +14,7 @@ graphivore
|
||||
green_orange
|
||||
grid
|
||||
hillside
|
||||
metro
|
||||
openphpnuke
|
||||
original_small
|
||||
paradice
|
||||
|
||||
Loading…
Reference in New Issue
Block a user
