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:
Michal Čihař 2012-05-06 00:11:30 +02:00
commit e59630478d
11 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/config/ConfigFile.class.php
View File

@ -213,7 +213,7 @@ class ConfigFile
// value
if (!isset($this->persistKeys[$canonical_path])) {
$default_value = $this->getDefault($canonical_path);
// we need oryginal config values not overwritten by user
// we need original config values not overwritten by user
// preferences to allow for overwriting options set in
// config.inc.php with default values
$instance_default_value = PMA_array_read(

2
libraries/export/htmlword.php
View File

@ -240,8 +240,6 @@ if (isset($plugin_list)) {
function PMA_getTableDefStandIn($db, $view, $crlf)
{
$schema_insert = '<table class="width100" cellspacing="1">';
$columns_cnt = 4;
$schema_insert .= '<tr class="print-category">';
$schema_insert .= '<th class="print">'
. __('Column')

1
libraries/export/sql.php
View File

@ -1185,7 +1185,6 @@ if (isset($plugin_list)) {
) {
global $cfgRelation;
global $sql_backquotes;
global $sql_constraints;
$schema_create = '';

2
libraries/export/texytext.php
View File

@ -234,8 +234,6 @@ if (isset($plugin_list)) {
* Displays the table structure
*/
$columns_cnt = 4;
$text_output .= "|------\n";
$text_output .= '|' . __('Column');
$text_output .= '|' . __('Type');

2
libraries/export/xml.php
View File

@ -267,7 +267,6 @@ if (isset($plugin_list)) {
$head .= ' </pma:function>' . $crlf;
}
unset($create_func);
unset($function);
unset($functions);
}
@ -293,7 +292,6 @@ if (isset($plugin_list)) {
$head .= ' </pma:procedure>' . $crlf;
}
unset($create_proc);
unset($procedure);
unset($procedures);
}

6
libraries/import/mediawiki.php
View File

@ -299,7 +299,7 @@ function PMA_importDataOneTable ($table)
*/
function PMA_setTableName(&$table_name)
{
if (empty($table_name) && strlen($db)) {
if (empty($table_name)) {
$result = PMA_DBI_fetch_result('SHOW TABLES');
// todo check if the name below already exists
$table_name = 'TABLE '.(count($result) + 1);
@ -317,7 +317,7 @@ function PMA_setTableName(&$table_name)
*/
function PMA_setTableHeaders(&$table_headers, $table_row)
{
if ( empty($table_headers) ) {
if (empty($table_headers)) {
// The first table row should contain the number of columns
// If they are not set, generic names will be given (COL 1, COL 2, etc)
$num_cols = count($table_row);
@ -486,4 +486,4 @@ function PMA_explodeMarkup($text)
return $items;
}
?>
?>

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

@ -984,7 +984,7 @@ function PMA_RTN_getEditorForm($mode, $operation, $routine)
*/
function PMA_RTN_getQueryFromRequest()
{
global $_REQUEST, $cfg, $errors, $param_sqldataaccess, $param_directions;
global $_REQUEST, $errors, $param_sqldataaccess, $param_directions;
$_REQUEST['item_type'] = isset($_REQUEST['item_type']) ? $_REQUEST['item_type'] : '';
$column_types = $GLOBALS['PMA_Types']->getColumns();
@ -1134,7 +1134,7 @@ function PMA_RTN_getQueryFromRequest()
*/
function PMA_RTN_handleExecute()
{
global $_GET, $_POST, $_REQUEST, $GLOBALS, $db, $cfg;
global $_GET, $_POST, $_REQUEST, $GLOBALS, $db;
/**
* Handle all user requests other than the default of listing routines

1
libraries/schema/Export_Relation_Schema.class.php
View File

@ -224,7 +224,6 @@ class PMA_Export_Relation_Schema
*/
function dieSchema($pageNumber, $type = '', $error_message = '')
{
global $cfg;
global $db;
include_once './libraries/header.inc.php';

11
libraries/schema/User_Schema.class.php
View File

@ -284,7 +284,7 @@ class PMA_User_Schema
$i = 0;
$odd_row = true;
foreach ($array_sh_page as $dummy_sh_page => $sh_page) {
foreach ($array_sh_page as $sh_page) {
$_mtab = $sh_page['table_name'];
$tabExist[$_mtab] = false;
echo "\n" . ' <tr class="noclick ';
@ -372,7 +372,7 @@ class PMA_User_Schema
public function displaySchemaGenerationOptions()
{
global $cfg,$pmaThemeImage,$db,$test_rs,$chpage;
global $cfg,$db,$test_rs,$chpage;
?>
<form method="post" action="schema_export.php">
<fieldset>
@ -434,7 +434,7 @@ class PMA_User_Schema
<br />
<select name="paper" id="paper_opt" onchange="refreshDragOption('pdflayout');">
<?php
foreach ($cfg['PDFPageSizes'] as $key => $val) {
foreach ($cfg['PDFPageSizes'] as $val) {
echo '<option value="' . $val . '"';
if ($val == $cfg['PDFDefaultPageSize']) {
echo ' selected="selected"';
@ -465,7 +465,6 @@ class PMA_User_Schema
*/
private function _deleteTables($db, $chpage, $tabExist)
{
global $table;
$_strtrans = '';
$_strname = '';
$shoot = false;
@ -516,7 +515,7 @@ class PMA_User_Schema
$draginit2 = '';
$reset_draginit = '';
$i = 0;
foreach ($array_sh_page as $key => $temp_sh_page) {
foreach ($array_sh_page as $temp_sh_page) {
$drag_x = $temp_sh_page['x'];
$drag_y = $temp_sh_page['y'];
@ -617,7 +616,7 @@ class PMA_User_Schema
PMA_DBI_select_db($db);
include "libraries/schema/" . ucfirst($export_type) . "_Relation_Schema.class.php";
$obj_schema = eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();");
eval("new PMA_" . ucfirst($export_type) . "_Relation_Schema();");
}
/**

5
libraries/schema/Visio_Relation_Schema.class.php
View File

@ -315,10 +315,10 @@ class Table_Stats
*
* @return void
* @see PMA_VISIO
* @todo function does nothing, what should it do?
*/
private function _setWidthTable($font,$fontSize)
{
global $visio;
}
/**
@ -348,7 +348,6 @@ class Table_Stats
*/
public function tableDraw($showColor)
{
global $visio;
//echo $this->_tableName.'<br />';
foreach ($this->fields as $field) {
@ -473,8 +472,6 @@ class Relation_Stats
*/
public function relationDraw($changeColor)
{
global $visio;
if ($changeColor) {
$listOfColors = array(
'red',

2
libraries/transformations/text_plain__external.inc.php
View File

@ -93,7 +93,7 @@ function PMA_transformation_text_plain__external($buffer, $options = array(), $m
}
fclose($pipes[1]);
// we don't currently use the return value
$return_value = proc_close($process);
proc_close($process);
}
if ($options[2] == 1 || $options[2] == '2') {