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 2013-07-03 14:01:00 +02:00
commit f73dc33a74
5 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/Error.class.php
View File

@ -248,7 +248,7 @@ class PMA_Error extends PMA_Message
/**
* Get HTML backtrace
*
* @return void
* @return string
*/
public function getBacktraceDisplay()
{
@ -364,8 +364,8 @@ class PMA_Error extends PMA_Message
/**
* return short relative path to phpMyAdmin basedir
*
* prevent path disclusore in error message,
* and make users feel save to submit error reports
* prevent path disclosure in error message,
* and make users feel safe to submit error reports
*
* @param string $dest path to be shorten
*
@ -384,7 +384,7 @@ class PMA_Error extends PMA_Message
$Ahere = explode(
$path_separator,
realpath(dirname(__FILE__) . $path_separator . '..')
realpath(__DIR__ . $path_separator . '..')
);
$Adest = explode($path_separator, $dest);

2
libraries/Index.class.php
View File

@ -358,7 +358,7 @@ class PMA_Index
/**
* Returns index choice (PRIMARY, UNIQUE, INDEX, SPATIAL, FULLTEXT)
*
* @return index choice
* @return string index choice
*/
public function getChoice()
{

1
libraries/List_Database.class.php
View File

@ -247,6 +247,7 @@ class PMA_List_Database extends PMA_List
$tmp_mydbs = $GLOBALS['dbi']->fetchResult(
$local_query, null, null, $GLOBALS['controllink']
);
$dblist = array();
if ($tmp_mydbs) {
// Will use as associative array of the following 2 code
// lines:

2
libraries/insert_edit.lib.php
View File

@ -253,7 +253,7 @@ function PMA_showColumnTypesInDataEditView($url_params, $showColumnType)
*
* @param array $column containing column type, Default and null
*
* @return nothing
* @return void
*/
function PMA_getDefaultForDatetime($column)
{

12
test/AllSeleniumTests.php
View File

@ -8,12 +8,12 @@
*/
require_once 'PHPUnit/TextUI/TestRunner.php';
require_once dirname(__FILE__).'/selenium/PmaSeleniumTestCase.php';
require_once dirname(__FILE__).'/selenium/PmaSeleniumLoginTest.php';
require_once dirname(__FILE__).'/selenium/PmaSeleniumXssTest.php';
require_once dirname(__FILE__).'/selenium/PmaSeleniumPrivilegesTest.php';
require_once dirname(__FILE__).'/selenium/PmaSeleniumCreateDropDatabaseTest.php';
require_once dirname(__FILE__).'/selenium/PmaSeleniumCreateRemoveUserTest.php';
require_once __DIR__.'/selenium/PmaSeleniumTestCase.php';
require_once __DIR__.'/selenium/PmaSeleniumLoginTest.php';
require_once __DIR__.'/selenium/PmaSeleniumXssTest.php';
require_once __DIR__.'/selenium/PmaSeleniumPrivilegesTest.php';
require_once __DIR__.'/selenium/PmaSeleniumCreateDropDatabaseTest.php';
require_once __DIR__.'/selenium/PmaSeleniumCreateRemoveUserTest.php';
/**
* AllSeleniumTests class