Commit 60f1006f authored by Daniel Kudwien's avatar Daniel Kudwien
Browse files

Issue #1146644 by sun: Fixed PHP 5.3 compability in tests.

parent 509ea33a

CHANGELOG.txt

+1 −0
Changes for CHANGELOG.txt: 1 added line, 0 removed lines.
Original line number Diff line number Diff line 


Admin Menu 7.x-3.x, xxxx-xx-xx

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

#1146644 by sun: Fixed PHP 5.3 compability in tests.

#442560 by sun: Fixed 'defer' script attribute breaks Drupal.behaviors in FF3.6.

#1022902 by matglas86, sun: Updated for changed core Toolbar styles.

tests/admin_menu.test

+4 −5
Changes for tests/admin_menu.test: 4 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -9,10 +9,10 @@ 
 * Base class for all administration menu web test cases.

 */

class AdminMenuWebTestCase extends DrupalWebTestCase {

  function setUp() {

  function setUp($modules = array()) {

    // Enable admin menu module and any other modules.

    $args = func_get_args();

    call_user_func_array(array($this, 'parent::setUp'), array_merge(array('admin_menu'), $args));

    $modules[] = 'admin_menu';

    parent::setUp($modules);



    // Disable client-side caching.

    variable_set('admin_menu_cache_client', FALSE);
@@ -64,8 +64,7 @@ class AdminMenuPermissionsTestCase extends AdminMenuWebTestCase { 
  }



  function setUp() {

    // Additionally enable contact module.

    parent::setUp('contact');

    parent::setUp(array('contact'));

  }



  /**