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 2015-03-07 16:08:12 +01:00
commit d9ec098062
9 changed files with 19 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db_search.php
View File

@ -37,7 +37,7 @@ $url_params['goto'] = 'db_search.php';
$db_search = new PMA_DbSearch($GLOBALS['db']);
// Display top links if we are not in an Ajax request
if ( $GLOBALS['is_ajax_request'] != true) {
if ($GLOBALS['is_ajax_request'] != true) {
include 'libraries/db_info.inc.php';
}

11
db_structure.php
View File

@ -235,11 +235,12 @@ foreach ($tables as $keyname => $current_table) {
* I could have used the PHP ternary conditional operator but I find
* the code easier to read without this operator.
*/
list($browse_table, $search_table, $browse_table_label, $empty_table,
$tracking_icon) = PMA_getHtmlForActionLinks(
$current_table, $table_is_view, $tbl_url_query,
$titles, $truename, $db_is_system_schema, $url_query
);
list($browse_table, $search_table, $browse_table_label,
$empty_table, $tracking_icon
) = PMA_getHtmlForActionLinks(
$current_table, $table_is_view, $tbl_url_query,
$titles, $truename, $db_is_system_schema, $url_query
);
if (! $db_is_system_schema) {
list($drop_query, $drop_message)

4
index.php
View File

@ -38,9 +38,9 @@ unset($drops, $each_drop);
* Such scripts must not be loaded on home page.
*
*/
$target_blacklist = array (
$target_blacklist = array (
'import.php', 'export.php'
);
);
// If we have a valid target, let's load that script instead
if (! empty($_REQUEST['target'])

2
libraries/navigation/NavigationTree.class.php
View File

@ -948,7 +948,7 @@ class PMA_NavigationTree
if ($node->hasSiblings()
|| $node->realParent() === false
) {
if ( $node->type == Node::CONTAINER
if ($node->type == Node::CONTAINER
&& count($node->children) == 0
&& $GLOBALS['is_ajax_request'] != true
) {

2
libraries/navigation/Nodes/Node.class.php
View File

@ -217,7 +217,7 @@ class Node
}
$parent = $this->parent;
while (isset($parent)) {
if ( ($parent->type != Node::CONTAINER || $containers)
if (($parent->type != Node::CONTAINER || $containers)
&& ($parent->is_group != true || $groups)
) {
$parents[] = $parent;

8
libraries/navigation/Nodes/Node_Database.class.php
View File

@ -92,7 +92,7 @@ class Node_Database extends Node
/**
* Returns the number of tables or views present inside this database
*
* @param string $which tables|views
* @param string $which tables|views
* @param string $searchClause A string used to filter the results of
* the query
* @param boolean $singleItem Whether to get presence of a single known
@ -385,7 +385,7 @@ class Node_Database extends Node
/**
* Returns the list of tables or views inside this database
*
* @param string $which tables|views
* @param string $which tables|views
* @param int $pos The offset of the list within the results
* @param string $searchClause A string used to filter the results of the query
*
@ -478,7 +478,7 @@ class Node_Database extends Node
/**
* Returns the list of procedures or functions inside this database
*
* @param string $routineType PROCEDURE|FUNCTION
* @param string $routineType PROCEDURE|FUNCTION
* @param int $pos The offset of the list within the results
* @param string $searchClause A string used to filter the results of the query
*
@ -621,7 +621,7 @@ class Node_Database extends Node
$ret = '';
$cfgRelation = PMA_getRelationsParam();
if (isset($cfgRelation['navwork']) && $cfgRelation['navwork']) {
if ( $this->_hiddenCount > 0) {
if ($this->_hiddenCount > 0) {
$ret = '<span class="dbItemControls">'
. '<a href="navigation.php'
. PMA_URL_getCommon()

2
libraries/rte/rte_export.lib.php
View File

@ -80,7 +80,7 @@ function PMA_RTN_handleExport()
{
global $_GET, $db;
if ( ! empty($_GET['export_item'])
if (! empty($_GET['export_item'])
&& ! empty($_GET['item_name'])
&& ! empty($_GET['item_type'])
) {

4
libraries/rte/rte_routines.lib.php
View File

@ -540,7 +540,7 @@ function PMA_RTN_getDataFromRequest()
$retval['item_param_length'] = array();
$retval['item_param_opts_num'] = array();
$retval['item_param_opts_text'] = array();
if ( isset($_REQUEST['item_param_name'])
if (isset($_REQUEST['item_param_name'])
&& isset($_REQUEST['item_param_type'])
&& isset($_REQUEST['item_param_length'])
&& isset($_REQUEST['item_param_opts_num'])
@ -1149,7 +1149,7 @@ function PMA_RTN_getQueryFromRequest()
$warned_about_dir = false;
$warned_about_length = false;
if ( ! empty($_REQUEST['item_param_name'])
if (! empty($_REQUEST['item_param_name'])
&& ! empty($_REQUEST['item_param_type'])
&& ! empty($_REQUEST['item_param_length'])
&& is_array($_REQUEST['item_param_name'])

2
tbl_zoom_select.php
View File

@ -102,7 +102,7 @@ if (! isset($goto)) {
$err_url = $goto . PMA_URL_getCommon(array('db' => $db, 'table' => $table));
//Set default datalabel if not selected
if ( !isset($_POST['zoom_submit']) || $_POST['dataLabel'] == '') {
if (!isset($_POST['zoom_submit']) || $_POST['dataLabel'] == '') {
$dataLabel = PMA_getDisplayField($db, $table);
} else {
$dataLabel = $_POST['dataLabel'];