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

Fix documentation links (bug #1341676).

Browse Source
This commit is contained in:
Michal Čihař
2005-10-29 19:37:45 +00:00
parent fd2196ce5c
commit 5e1ddad64e
6 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -9,6 +9,10 @@ $Source$
* Documentation.html, config.default.php, libraries/common.lib.php: Link * Documentation.html, config.default.php, libraries/common.lib.php: Link
documentation to version we run (RFE #1334292), fix links for chapter documentation to version we run (RFE #1334292), fix links for chapter
documentation (bug #1341676), drop support for old links. documentation (bug #1341676), drop support for old links.
* tbl_indexes.php, tbl_properties.inc.php, tbl_select.php,
libraries/display_create_database.lib.php,
libraries/sql_query_form.lib.php: Fix documentation links (bug
#1341676).
2005-10-29 Olivier Mueller <om@omnis.ch> 2005-10-29 Olivier Mueller <om@omnis.ch>
* scripts/upgrade.pl: various fixes (was not handling rc/pl correctely), * scripts/upgrade.pl: various fixes (was not handling rc/pl correctely),

4
libraries/display_create_database.lib.php
View File

@@ -10,7 +10,7 @@ if ($is_create_db_priv) {
// The user is allowed to create a db // The user is allowed to create a db
?> ?>
<form method="post" action="db_create.php"><b> <form method="post" action="db_create.php"><b>
<?php echo $strCreateNewDatabase . '&nbsp;' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br /> <?php echo $strCreateNewDatabase . '&nbsp;' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></b><br />
<?php echo PMA_generate_common_hidden_inputs('', '', 5); ?> <?php echo PMA_generate_common_hidden_inputs('', '', 5); ?>
<input type="hidden" name="reload" value="1" /> <input type="hidden" name="reload" value="1" />
<input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" /> <input type="text" name="db" value="<?php echo $db_to_create; ?>" maxlength="64" class="textfield" />
@@ -26,7 +26,7 @@ if ($is_create_db_priv) {
} else { } else {
?> ?>
<!-- db creation no privileges message --> <!-- db creation no privileges message -->
<b><?php echo $strCreateNewDatabase . ':&nbsp;' . PMA_showMySQLDocu('Reference', 'CREATE_DATABASE'); ?></b><br /> <b><?php echo $strCreateNewDatabase . ':&nbsp;' . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_DATABASE'); ?></b><br />
<?php <?php
echo '<span class="noPrivileges">' echo '<span class="noPrivileges">'
. ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" width="11" height="11" hspace="2" border="0" align="middle" />' : '') . ($cfg['ErrorIconic'] ? '<img src="' . $pmaThemeImage . 's_error2.png" width="11" height="11" hspace="2" border="0" align="middle" />' : '')

2
libraries/sql_query_form.lib.php
View File

@@ -259,7 +259,7 @@ function PMA_sqlQueryFormInsert( $query = '', $is_querywindow = false ) {
$GLOBALS['cfg']['DefaultQueryTable'] ) ) ); $GLOBALS['cfg']['DefaultQueryTable'] ) ) );
} }
} }
$legend .= ': ' . PMA_showMySQLDocu( 'Reference', 'SELECT' ); $legend .= ': ' . PMA_showMySQLDocu( 'SQL-Syntax', 'SELECT' );
if ( count( $fields_list ) ) { if ( count( $fields_list ) ) {
$sqlquerycontainer_id = 'sqlquerycontainer'; $sqlquerycontainer_id = 'sqlquerycontainer';

2
tbl_indexes.php
View File

@@ -283,7 +283,7 @@ else if (!defined('PMA_IDX_INCLUDED')
} // end for } // end for
?> ?>
</select> </select>
<?php echo PMA_showMySQLDocu('Reference', 'ALTER_TABLE') . "\n"; ?> <?php echo PMA_showMySQLDocu('SQL-Syntax', 'ALTER_TABLE') . "\n"; ?>
</td> </td>
</tr> </tr>

4
tbl_properties.inc.php
View File

@@ -111,7 +111,7 @@ $header_cells = array();
$content_cells = array(); $content_cells = array();
$header_cells[] = $strField; $header_cells[] = $strField;
$header_cells[] = $strType . ($GLOBALS['cfg']['ReplaceHelpImg'] ? PMA_showMySQLDocu('Reference', 'Column_types') : '<br /><span style="font-weight: normal">' . PMA_showMySQLDocu('Reference', 'Column_types') . '</span>'); $header_cells[] = $strType . ($GLOBALS['cfg']['ReplaceHelpImg'] ? PMA_showMySQLDocu('SQL-Syntax', 'Column_types') : '<br /><span style="font-weight: normal">' . PMA_showMySQLDocu('SQL-Syntax', 'Column_types') . '</span>');
$header_cells[] = $strLengthSet; $header_cells[] = $strLengthSet;
if (PMA_MYSQL_INT_VERSION >= 40100) { if (PMA_MYSQL_INT_VERSION >= 40100) {
$header_cells[] = $strCollation; $header_cells[] = $strCollation;
@@ -720,4 +720,4 @@ if ($cfgRelation['commwork'] && $cfgRelation['mimework'] && $cfg['BrowseMIME'])
</table> </table>
<br /> <br />
<center><?php echo PMA_showMySQLDocu('Reference', 'CREATE_TABLE'); ?></center> <center><?php echo PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE'); ?></center>

2
tbl_select.php
View File

@@ -199,7 +199,7 @@ function PMA_tbl_select_operator(f, index, multiple) {
<tr> <tr>
<th align="left" class="tblHeaders" colspan="2"> <th align="left" class="tblHeaders" colspan="2">
<?php echo $strAddSearchConditions; ?> <?php echo $strAddSearchConditions; ?>
<?php echo PMA_showMySQLDocu('Reference', 'Functions') . "\n"; ?> <?php echo PMA_showMySQLDocu('SQL-Syntax', 'Functions') . "\n"; ?>
</th> </th>
</tr> </tr>
<tr> <tr>