Index: modules/system/system.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.module,v
retrieving revision 1.827
diff -u -r1.827 system.module
--- modules/system/system.module	27 Oct 2009 04:16:39 -0000	1.827
+++ modules/system/system.module	28 Oct 2009 23:04:10 -0000
@@ -1153,6 +1153,8 @@
     ),
     'dependencies' => array(
       array('system', 'ui'),
+      array('system', 'ui.draggable'),
+      array('system', 'ui.resizable'),
     ),
   );
   $libraries['ui.draggable'] = array(
Index: modules/php/php.test
===================================================================
RCS file: /cvs/drupal/drupal/modules/php/php.test,v
retrieving revision 1.18
diff -u -r1.18 php.test
--- modules/php/php.test	11 Oct 2009 03:07:19 -0000	1.18
+++ modules/php/php.test	28 Oct 2009 23:04:09 -0000
@@ -60,7 +60,7 @@
 
     // Make sure that the PHP code shows up as text.
     $this->drupalGet('node/' . $node->nid);
-    $this->assertText('print', t('PHP code is displayed.'));
+    $this->assertText('print "SimpleTest PHP was executed!"', t('PHP code is displayed.'));
 
     // Change filter to PHP filter and see that PHP code is evaluated.
     $edit = array();
@@ -70,7 +70,7 @@
     $this->assertRaw(t('Page %title has been updated.', array('%title' => $node->title[FIELD_LANGUAGE_NONE][0]['value'])), t('PHP code filter turned on.'));
 
     // Make sure that the PHP code shows up as text.
-    $this->assertNoText('print', t('PHP code isn\'t displayed.'));
+    $this->assertNoText('print "SimpleTest PHP was executed!"', t('PHP code isn\'t displayed.'));
     $this->assertText('SimpleTest PHP was executed!', t('PHP code has been evaluated.'));
   }
 }
Index: modules/filter/filter.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.admin.inc,v
retrieving revision 1.49
diff -u -r1.49 filter.admin.inc
--- modules/filter/filter.admin.inc	13 Oct 2009 15:39:41 -0000	1.49
+++ modules/filter/filter.admin.inc	28 Oct 2009 23:04:09 -0000
@@ -160,7 +160,28 @@
       $tiplist = '<p>' . t('No guidelines available.') . '</p>';
     }
     else {
-      $tiplist .= theme('filter_tips_more_info');
+      $tiplist .= '<p>' . l(t('More information about text formats'), 'filter/tips', array('attributes' => array('class' => array('filter-tips-modal')))) . '</p>';
+
+      // Create a dialog box for the filter tips.
+      $tiplist .= '<div id="filter-tips-modal-dialog" class="ui-helper-hidden" title="' . t('Filter tips') . '">' . filter_tips_long() . '</div>';
+      drupal_add_ui(array(
+        'library' => 'ui.dialog',
+        'selector' => '#filter-tips-modal-dialog',
+        'arguments' => array(
+          array(
+            'width' => 600,
+            'height' => 500,
+            'autoOpen' => FALSE,
+          ),
+        ),
+      ));
+      drupal_add_ui(array(
+        'library' => 'ui.dialog',
+        'selector' => '#filter-tips-modal-dialog',
+        'arguments' => array('open'),
+        'event' => 'click',
+        'bound_element' => '.filter-tips-modal',
+      ));
     }
     $group = '<p>' . t('These are the guidelines that users will see for posting in this text format. They are automatically generated from the filter settings.') . '</p>';
     $group .= $tiplist;
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.300
diff -u -r1.300 filter.module
--- modules/filter/filter.module	23 Oct 2009 22:24:14 -0000	1.300
+++ modules/filter/filter.module	28 Oct 2009 23:04:09 -0000
@@ -49,9 +49,6 @@
       'variables' => array('tips' => NULL, 'long' => FALSE),
       'file' => 'filter.pages.inc',
     ),
-    'filter_tips_more_info' => array(
-      'variables' => array(),
-    ),
     'filter_guidelines' => array(
       'variables' => array('format' => NULL),
     ),
@@ -674,10 +671,40 @@
   );
   $form['format_help'] = array(
     '#prefix' => '<div id="' . $element_id . '-help" class="filter-help">',
-    '#markup' => theme('filter_tips_more_info'),
     '#suffix' => '</div>',
     '#weight' => 1,
   );
+  // Present the more information about text formats link.
+  $form['format_help']['more'] = array(
+    '#markup' => l(t('More information about text formats'), 'filter/tips', array('attributes' => array('class' => array('filter-tips-modal')))),
+  );
+  $form['format_help']['long'] = array(
+    '#prefix' => '<div id="filter-tips-modal-dialog" class="ui-helper-hidden" title="' . t('Filter tips') . '">',
+    '#markup' => filter_tips_long(),
+    '#suffix' => '</div>',
+  );
+
+  // Create a dialog box for the filter tips.
+  $form['#attached']['ui'][] = array(
+    'library' => 'ui.dialog',
+    'selector' => '#filter-tips-modal-dialog',
+    'arguments' => array(
+      array(
+        'width' => 600,
+        'height' => 500,
+        'dialogClass' => 'filter-tips',
+        'autoOpen' => FALSE,
+      ),
+    ),
+  );
+  // When the user clicks on the more information link, present the dialog box.
+  $form['#attached']['ui'][] = array(
+    'library' => 'ui.dialog',
+    'selector' => '#filter-tips-modal-dialog',
+    'arguments' => array('open'),
+    'event' => 'click',
+    'bound_element' => '.filter-tips-modal',
+  );
 
   return $form;
 }
@@ -786,15 +813,6 @@
 }
 
 /**
- * Format a link to the more extensive filter tips.
- *
- * @ingroup themeable
- */
-function theme_filter_tips_more_info() {
-  return '<p>' . l(t('More information about text formats'), 'filter/tips') . '</p>';
-}
-
-/**
  * Format guidelines for a text format.
  *
  * @param $variables
Index: modules/filter/filter.pages.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.pages.inc,v
retrieving revision 1.9
diff -u -r1.9 filter.pages.inc
--- modules/filter/filter.pages.inc	13 Oct 2009 15:39:41 -0000	1.9
+++ modules/filter/filter.pages.inc	28 Oct 2009 23:04:09 -0000
@@ -11,17 +11,9 @@
  * Menu callback; show a page with long filter tips.
  */
 function filter_tips_long() {
-  $format_id = arg(2);
-  if ($format_id) {
-    $output = theme('filter_tips', array('tips' => _filter_tips($format_id, TRUE), 'long' => TRUE));
-  }
-  else {
-    $output = theme('filter_tips', array('tips' => _filter_tips(-1, TRUE), 'long' => TRUE));
-  }
-  return $output;
+  return theme('filter_tips', array('tips' => _filter_tips(-1, TRUE), 'long' => TRUE));
 }
 
-
 /**
  * Render HTML for a set of filter tips.
  *