Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-08-06 13:54:11 +02:00
commit d6728d16ce
2 changed files with 8 additions and 8 deletions

View File

@ -912,7 +912,7 @@ function PMA_getRenameToPanel()
*
* @return string html
*/
function PMA_getHavingQueuryPanel()
function PMA_getHavingQueryPanel()
{
$html = '<table id="query_having" style="display:none;" ';
$html .= 'width="5%" cellpadding="0" cellspacing="0">';
@ -1000,7 +1000,7 @@ function PMA_getHavingQueuryPanel()
*
* @return string html
*/
function PMA_getAggregateQueuryPanel()
function PMA_getAggregateQueryPanel()
{
$html = '<table id="query_Aggregate" style="display:none;"';
$html .= 'width="5%" cellpadding="0" cellspacing="0">';
@ -1068,7 +1068,7 @@ function PMA_getAggregateQueuryPanel()
*
* @return string html
*/
function PMA_getWhereQueuryPanel()
function PMA_getWhereQueryPanel()
{
$html = '<table id="query_where" style="display:none;"';
$html .= 'width="5%" cellpadding="0" cellspacing="0">';
@ -1145,7 +1145,7 @@ function PMA_getWhereQueuryPanel()
*
* @return string html
*/
function PMA_getQueuryDetails()
function PMA_getQueryDetails()
{
$html = '<div class="panel">';
$html .= '<div style="clear:both;"></div>';

View File

@ -130,11 +130,11 @@ $response->addHTML(PMA_getDeleteRelationPanel());
$response->addHTML(PMA_getOptionsPanel());
$response->addHTML(PMA_getRenameToPanel());
$response->addHTML(PMA_getHavingQueuryPanel());
$response->addHTML(PMA_getAggregateQueuryPanel());
$response->addHTML(PMA_getWhereQueuryPanel());
$response->addHTML(PMA_getHavingQueryPanel());
$response->addHTML(PMA_getAggregateQueryPanel());
$response->addHTML(PMA_getWhereQueryPanel());
if (! empty($_REQUEST['query'])) {
$response->addHTML(PMA_getQueuryDetails());
$response->addHTML(PMA_getQueryDetails());
}
$response->addHTML(PMA_getCacheImages());