[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_9RC1-24867-gbb1fd3c

Michal Čihař nijel at users.sourceforge.net
Fri Dec 16 15:37:58 CET 2011


The branch, master has been updated
       via  bb1fd3c966b04d3ed8374d065ad804c6d58643d8 (commit)
       via  03f26421dc26f8b4cebe4851ab669e6c9088838e (commit)
       via  9502e57c347208ec3c42cdcbe8fef468b87b6fb1 (commit)
      from  c296064614b6c31cf79b48a34d9308e5e7943588 (commit)


- Log -----------------------------------------------------------------
commit bb1fd3c966b04d3ed8374d065ad804c6d58643d8
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Dec 16 15:36:06 2011 +0100

    Expect token here as well

commit 03f26421dc26f8b4cebe4851ab669e6c9088838e
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Dec 16 15:35:57 2011 +0100

    Load theme here, otherwise it pollutes cache in PMA_getImage

commit 9502e57c347208ec3c42cdcbe8fef468b87b6fb1
Author: Michal Čihař <mcihar at suse.cz>
Date:   Fri Dec 16 15:35:35 2011 +0100

    Whitespace cleanup

-----------------------------------------------------------------------

Summary of changes:
 libraries/common.lib.php          |   12 ++++++------
 test/classes/Advisor_test.php     |    1 +
 test/classes/PMA_Message_test.php |    3 ++-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 62e49ff..cd56d03 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2363,18 +2363,18 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
             }
         }
 
-/* 
+/*
     Add page numbers with "geometrically increasing" distances.
 
     This helps me a lot when navigating through giant tables.
-    
+
     Test case: table with 2.28 million sets, 76190 pages. Page of interest is
-    between 72376 and 76190. 
+    between 72376 and 76190.
     Selecting page 72376.
-    Now, old version enumerated only +/- 10 pages around 72376 and the 
+    Now, old version enumerated only +/- 10 pages around 72376 and the
     percentage increment produced steps of about 3000.
 
-    The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc. 
+    The following code adds page numbers +/- 2,4,8,16,32,64,128,256 etc.
     around the current page.
 */
 
@@ -2397,7 +2397,7 @@ function PMA_pageselector($rows, $pageNow = 1, $nbTotalPage = 1,
                 $pages[] = $i;
             }
         }
- 
+
         // Since because of ellipsing of the current page some numbers may be double,
         // we unify our array:
         sort($pages);
diff --git a/test/classes/Advisor_test.php b/test/classes/Advisor_test.php
index 1ef60b2..c57b367 100644
--- a/test/classes/Advisor_test.php
+++ b/test/classes/Advisor_test.php
@@ -20,6 +20,7 @@ class Advisor_test extends PHPUnit_Framework_TestCase
     {
         $_SESSION[' PMA_token '] = 'token';
         $GLOBALS['lang'] = 'en';
+        $_SESSION['PMA_Theme'] = PMA_Theme::load('./themes/pmahomme');
     }
 
     /**
diff --git a/test/classes/PMA_Message_test.php b/test/classes/PMA_Message_test.php
index 5968594..72ab91a 100644
--- a/test/classes/PMA_Message_test.php
+++ b/test/classes/PMA_Message_test.php
@@ -256,7 +256,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
             ),
             array(
                 '[a at http://foo.bar/@Documentation]link[/a]',
-                '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F&lang=en" target="Documentation">link</a>'
+                '<a href="./url.php?url=http%3A%2F%2Ffoo.bar%2F&lang=en&token=token" target="Documentation">link</a>'
             ),
             array(
                 '[a at ./non-existing at Documentation]link[/a]',
@@ -277,6 +277,7 @@ class PMA_Message_test extends PHPUnit_Extensions_OutputTestCase
     public function testDecodeBB($actual, $expected)
     {
         $GLOBALS['lang'] = 'en';
+        $_SESSION[' PMA_token '] = 'token';
         $this->assertEquals($expected, PMA_Message::decodeBB($actual));
     }
 


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list