gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Put the parameter array in a new line

Browse Source 
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
This commit is contained in:
Madhura Jayaratne 2015-06-04 14:55:56 +05:30
parent 60e43ae164
commit 22c45521e7
3 changed files with 77 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libraries/tbl_gis_visualization.lib.php
View File

@ -149,16 +149,18 @@ function PMA_getHtmlForGisVisualization(
$downloadUrl = 'tbl_gis_visualization.php' . PMA_URL_getCommon($url_params)
. '&saveToFile=true';
return PMA\Template::get('gis_visualization/gis_visualization')->render(array(
'url_params' => $url_params,
'downloadUrl' => $downloadUrl,
'labelCandidates' => $labelCandidates,
'spatialCandidates' => $spatialCandidates,
'visualizationSettings' => $visualizationSettings,
'sql_query' => $sql_query,
'visualization' => $visualization,
'svgSupport' => $svgSupport,
'data' => $data
));
return PMA\Template::get('gis_visualization/gis_visualization')->render(
array(
'url_params' => $url_params,
'downloadUrl' => $downloadUrl,
'labelCandidates' => $labelCandidates,
'spatialCandidates' => $spatialCandidates,
'visualizationSettings' => $visualizationSettings,
'sql_query' => $sql_query,
'visualization' => $visualization,
'svgSupport' => $svgSupport,
'data' => $data
)
);
}
?>

14
libraries/tbl_indexes.lib.php
View File

@ -265,11 +265,13 @@ function PMA_getFormParameters($db, $table)
*/
function PMA_getHtmlForIndexForm($fields, $index, $form_params, $add_fields)
{
return PMA\Template::get('index_form')->render(array(
'fields' => $fields,
'index' => $index,
'form_params' => $form_params,
'add_fields' => $add_fields
));
return PMA\Template::get('index_form')->render(
array(
'fields' => $fields,
'index' => $index,
'form_params' => $form_params,
'add_fields' => $add_fields
)
);
}
?>

102
libraries/tbl_relation.lib.php
View File

@ -23,12 +23,14 @@ require_once 'libraries/Template.class.php';
function PMA_generateDropdown(
$dropdown_question, $select_name, $choices, $selected_value
) {
return PMA\Template::get('tbl_relation/dropdown_generate')->render(array(
'dropdown_question' => $dropdown_question,
'select_name' => $select_name,
'choices' => $choices,
'selected_value' => $selected_value
));
return PMA\Template::get('tbl_relation/dropdown_generate')->render(
array(
'dropdown_question' => $dropdown_question,
'select_name' => $select_name,
'choices' => $choices,
'selected_value' => $selected_value
)
);
}
/**
@ -137,12 +139,14 @@ function PMA_getSQLToCreateForeignKey($table, $field, $foreignDb, $foreignTable,
function PMA_generateRelationalDropdown(
$name, $values = array(), $foreign = false, $title = ''
) {
return PMA\Template::get('tbl_relation/relational_dropdown')->render(array(
'name' => $name,
'title' => $title,
'values' => $values,
'foreign' => $foreign
));
return PMA\Template::get('tbl_relation/relational_dropdown')->render(
array(
'name' => $name,
'title' => $title,
'values' => $values,
'foreign' => $foreign
)
);
}
/**
@ -162,16 +166,18 @@ function PMA_generateRelationalDropdown(
function PMA_getHtmlForCommonForm($db, $table, $columns, $cfgRelation,
$tbl_storage_engine, $existrel, $existrel_foreign, $options_array
) {
return PMA\Template::get('tbl_relation/common_form')->render(array(
'db' => $db,
'table' => $table,
'columns' => $columns,
'cfgRelation' => $cfgRelation,
'tbl_storage_engine' => $tbl_storage_engine,
'existrel' => $existrel,
'existrel_foreign' => $existrel_foreign,
'options_array' => $options_array
));
return PMA\Template::get('tbl_relation/common_form')->render(
array(
'db' => $db,
'table' => $table,
'columns' => $columns,
'cfgRelation' => $cfgRelation,
'tbl_storage_engine' => $tbl_storage_engine,
'existrel' => $existrel,
'existrel_foreign' => $existrel_foreign,
'options_array' => $options_array
)
);
}
/**
@ -230,16 +236,18 @@ function PMA_getHtmlForInternalRelationRow($save_row, $i, $odd_row,
$columns = $table_obj->getUniqueColumns(false, false);
}
return PMA\Template::get('tbl_relation/internal_relational_row')->render(array(
'myfield_md5' => $myfield_md5,
'myfield_html' => $myfield_html,
'odd_row' => $odd_row,
'foreign_db' => $foreign_db,
'foreign_table' => $foreign_table,
'tables' => $tables,
'foreign_column' => $foreign_column,
'columns' => $columns
));
return PMA\Template::get('tbl_relation/internal_relational_row')->render(
array(
'myfield_md5' => $myfield_md5,
'myfield_html' => $myfield_html,
'odd_row' => $odd_row,
'foreign_db' => $foreign_db,
'foreign_table' => $foreign_table,
'tables' => $tables,
'foreign_column' => $foreign_column,
'columns' => $columns
)
);
}
/**
@ -341,20 +349,22 @@ function PMA_getHtmlForForeignKeyRow($one_key, $odd_row, $columns, $i,
}
}
return PMA\Template::get('tbl_relation/foreign_key_row')->render(array(
'odd_row' => $odd_row,
'js_msg' => $js_msg,
'one_key' => $one_key,
'this_params' => $this_params,
'on_delete' => $on_delete,
'on_update' => $on_update,
'column_array' => $column_array,
'foreign_db' => $foreign_db,
'foreign_table' => $foreign_table,
'tables' => $tables,
'i' => $i,
'options_array' => $options_array
));
return PMA\Template::get('tbl_relation/foreign_key_row')->render(
array(
'odd_row' => $odd_row,
'js_msg' => $js_msg,
'one_key' => $one_key,
'this_params' => $this_params,
'on_delete' => $on_delete,
'on_update' => $on_update,
'column_array' => $column_array,
'foreign_db' => $foreign_db,
'foreign_table' => $foreign_table,
'tables' => $tables,
'i' => $i,
'options_array' => $options_array
)
);
}
/**