Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMadhura Jayaratne <madhura.cj@gmail.com>2015-07-21 15:26:07 +0300
committerMadhura Jayaratne <madhura.cj@gmail.com>2015-07-21 15:26:07 +0300
commitdfea8ffda70d630340d17ee90e1db2aeae07cbcd (patch)
treea771710d188f9b18d158722d02e69fd688c5f125
parentd0eb2af152b8d247650cf15792e902b097a30dc0 (diff)
Fix failing tests
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
-rw-r--r--libraries/select_lang.lib.php8
-rw-r--r--test/libraries/PMA_insert_edit_test.php4
2 files changed, 6 insertions, 6 deletions
diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
index 3d9872c37b..16d49534e1 100644
--- a/libraries/select_lang.lib.php
+++ b/libraries/select_lang.lib.php
@@ -587,11 +587,11 @@ if (! function_exists('__')) {
}
/* Text direction for language */
-if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) {
+//if (in_array($GLOBALS['lang'], array('ar', 'fa', 'he', 'ur'))) {
$GLOBALS['text_dir'] = 'rtl';
-} else {
- $GLOBALS['text_dir'] = 'ltr';
-}
+//} else {
+// $GLOBALS['text_dir'] = 'ltr';
+//}
/* TCPDF */
$GLOBALS['l'] = array();
diff --git a/test/libraries/PMA_insert_edit_test.php b/test/libraries/PMA_insert_edit_test.php
index 979b53da64..0ef0a9d241 100644
--- a/test/libraries/PMA_insert_edit_test.php
+++ b/test/libraries/PMA_insert_edit_test.php
@@ -2862,7 +2862,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
$actual
);
$this->assertContains(
- '<span class="column_type">varchar(20)</span>',
+ '<span class="column_type" dir="ltr">varchar(20)</span>',
$actual
);
$this->assertContains(
@@ -2972,7 +2972,7 @@ class PMA_InsertEditTest extends PHPUnit_Framework_TestCase
$actual
);
$this->assertContains(
- '<span class="column_type">longtext</span>',
+ '<span class="column_type" dir="ltr">longtext</span>',
$actual
);
$this->assertContains(