Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/CHANGELOG.txt,v retrieving revision 1.1.2.95.2.2 diff -u -p -r1.1.2.95.2.2 CHANGELOG.txt --- CHANGELOG.txt 10 Feb 2009 07:55:58 -0000 1.1.2.95.2.2 +++ CHANGELOG.txt 10 Feb 2009 08:03:48 -0000 @@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx Wysiwyg 5.x-2.x, xxxx-xx-xx --------------------------- +#319363 by sun: Fixed incomplete back-port of plugin API rewrite patch. #370277 by sun: Fixed "Uncaught SyntaxError: Unexpected token" in IE/Chrome. #367632 by sun: Fixed "Unexpected identifier, string or number" error in IE. #367632 by sun: Fixed invalid JavaScript syntax. Index: wysiwyg-dialog-page.tpl.php =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg-dialog-page.tpl.php,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 wysiwyg-dialog-page.tpl.php --- wysiwyg-dialog-page.tpl.php 7 Feb 2009 07:19:08 -0000 1.1.2.2 +++ wysiwyg-dialog-page.tpl.php 10 Feb 2009 07:59:40 -0000 @@ -7,19 +7,8 @@ * * Available variables: * - * General utility variables: - * - $base_path: The base URL path of the Drupal installation. At the very - * least, this will always default to /. - * - $css: An array of CSS files for the current page. - * - $directory: The directory the theme is located in, e.g. themes/garland or - * themes/garland/minelli. - * - $logged_in: TRUE if the user is registered and signed in. - * - $is_admin: TRUE if the user has permission to access administration pages. - * * Page metadata: - * - $language: (object) The language the site is being displayed in. - * $language->language contains its textual representation. - * $language->dir contains the language direction. It will either be 'ltr' or 'rtl'. + * - $language: The language the site is being displayed in. * - $head_title: A modified version of the page title, for use in the TITLE tag. * - $head: Markup for the HEAD section (including meta tags, keyword tags, and * so on). @@ -27,10 +16,6 @@ * - $scripts: Script tags necessary to load the JavaScript files and settings * for the page. * - * Site identity: - * - $site_name: The name of the site, empty when display has been disabled - * in theme settings. - * * Page content (in order of occurrance in the default page.tpl.php): * - $breadcrumb: The breadcrumb trail for the current page. * - $title: The page title, for use in the actual HTML content. @@ -46,7 +31,6 @@ * - $closure: Final closing markup from any modules that have altered the page. * This variable should always be output last, after all other dynamic content. * - * @see template_preprocess() * @see template_preprocess_wysiwyg_dialog_page() */ ?> Index: wysiwyg.dialog.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg.dialog.inc,v retrieving revision 1.1.2.2 diff -u -p -r1.1.2.2 wysiwyg.dialog.inc --- wysiwyg.dialog.inc 7 Feb 2009 07:19:08 -0000 1.1.2.2 +++ wysiwyg.dialog.inc 10 Feb 2009 08:03:02 -0000 @@ -59,39 +59,13 @@ function template_preprocess_wysiwyg_dia } /** - * @file - * Theme template to display a single Wysiwyg (plugin) dialog page. - * - * Available variables: - * - * Page metadata: - * - $language: The language the site is being displayed in. - * - $head_title: A modified version of the page title, for use in the TITLE tag. - * - $head: Markup for the HEAD section (including meta tags, keyword tags, and - * so on). - * - $styles: Style tags necessary to import all CSS files for the page. - * - $scripts: Script tags necessary to load the JavaScript files and settings - * for the page. - * - * Page content (in order of occurrance in the default page.tpl.php): - * - $breadcrumb: The breadcrumb trail for the current page. - * - $title: The page title, for use in the actual HTML content. - * - $help: Dynamic help text, mostly for admin pages. - * - $messages: HTML for status and error messages. Should be displayed prominently. - * - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the view - * and edit tabs when displaying a node). - * - * - $content: The main content of the current Drupal page. - * - * Footer/closing data: - * - $footer : The footer region. - * - $closure: Final closing markup from any modules that have altered the page. - * This variable should always be output last, after all other dynamic content. + * Render a single Wysiwyg (plugin) dialog page. (D5 only) * * @see template_preprocess_wysiwyg_dialog_page() + * @see wysiwyg-dialog-page.tpl.php */ -function theme_wysiwyg_dialog_page() { - $variables = array(); +function theme_wysiwyg_dialog_page($content) { + $variables = array('content' => $content); template_preprocess_wysiwyg_dialog_page($variables); return theme('render_template', drupal_get_path('module', 'wysiwyg') . '/wysiwyg-dialog-page.tpl.php', $variables); } Index: wysiwyg.plugins.inc =================================================================== RCS file: wysiwyg.plugins.inc diff -N wysiwyg.plugins.inc --- wysiwyg.plugins.inc 14 Oct 2008 21:46:11 -0000 1.1.2.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,23 +0,0 @@ - array( - 'path' => drupal_get_path('module', 'wysiwyg') .'/plugins/break/editor_plugin.js', - 'buttons' => array('break' => t('Teaser break')), - 'url' => 'http://drupal.org/project/wysiwyg', - ), - ); - } - break; - } -} -