Index: wp-includes/script-loader.php =================================================================== --- wp-includes/script-loader.php (revision 17295) +++ wp-includes/script-loader.php (working copy) @@ -68,7 +68,7 @@ $scripts->add_data( 'common', 'group', 1 ); $scripts->localize( 'common', 'commonL10n', array( 'warnDelete' => __("You are about to permanently delete the selected items.\n 'Cancel' to stop, 'OK' to delete."), - 'l10n_print_after' => 'try{convertEntities(commonL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(commonL10n);}' ) ); $scripts->add( 'sack', "/wp-includes/js/tw-sack$suffix.js", false, '1.6.1' ); @@ -86,7 +86,7 @@ 'enterURL' => __('Enter the URL'), 'enterImageURL' => __('Enter the URL of the image'), 'enterImageDescription' => __('Enter a description of the image'), - 'l10n_print_after' => 'try{convertEntities(quicktagsL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(quicktagsL10n);}' ) ); $scripts->add( 'colorpicker', "/wp-includes/js/colorpicker$suffix.js", array('prototype'), '3517m' ); @@ -100,7 +100,7 @@ $scripts->localize( 'wp-ajax-response', 'wpAjax', array( 'noPerm' => __('You do not have permission to do that.'), 'broken' => __('An unidentified error has occurred.'), - 'l10n_print_after' => 'try{convertEntities(wpAjax);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(wpAjax);}' ) ); $scripts->add( 'autosave', "/wp-includes/js/autosave$suffix.js", array('schedule', 'wp-ajax-response'), '20101004' ); @@ -193,7 +193,7 @@ 'of' => __('of'), 'close' => __('Close'), 'noiframes' => __('This feature requires inline frames. You have iframes disabled or your browser does not support them.'), - 'l10n_print_after' => 'try{convertEntities(thickboxL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(thickboxL10n);}' ) ); @@ -236,7 +236,7 @@ 'crunching' => __('Crunching…'), 'deleted' => __('moved to the trash.'), 'error_uploading' => __('“%s” has failed to upload due to an error'), - 'l10n_print_after' => 'try{convertEntities(swfuploadL10n);}catch(e){};', + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(swfuploadL10n);}', ) ); $scripts->add( 'comment-reply', "/wp-includes/js/comment-reply$suffix.js", false, '20090102'); @@ -256,7 +256,7 @@ 'good' => _x('Medium', 'password strength'), 'strong' => __('Strong'), 'mismatch' => __('Mismatch'), - 'l10n_print_after' => 'try{convertEntities(pwsL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(pwsL10n);}' ) ); $scripts->add( 'user-profile', "/wp-admin/js/user-profile$suffix.js", array( 'jquery', 'password-strength-meter' ), '20110113' ); @@ -265,7 +265,7 @@ $scripts->add( 'admin-bar', "/wp-includes/js/admin-bar$suffix.js", false, '20110112a' ); $scripts->add_data( 'admin-bar', 'group', 1 ); $scripts->localize( 'admin-bar', 'adminBarL10n', array( - 'l10n_print_after' => 'try{convertEntities(adminBarL10n);}catch(e){};', + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(adminBarL10n);}', ) ); $scripts->add( 'wplink', "/wp-includes/js/tinymce/plugins/wplink/js/wplink$suffix.js", array('jquery'), '20110111' ); @@ -274,7 +274,7 @@ 'save' => __('Add Link'), 'noTitle' => __('(no title)'), 'noMatchesFound' => __('No matches found.'), - 'l10n_print_after' => 'try{convertEntities(wpLinkL10n);}catch(e){};', + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(wpLinkL10n);}', ) ); $scripts->add( 'wpdialogs-popup', "/wp-includes/js/tinymce/plugins/wpdialogs/js/popup$suffix.js", array( 'jquery-ui-dialog' ), '20101119' ); @@ -285,7 +285,7 @@ $scripts->localize( 'ajaxcat', 'catL10n', array( 'add' => esc_attr(__('Add')), 'how' => __('Separate multiple categories with commas.'), - 'l10n_print_after' => 'try{convertEntities(catL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(catL10n);}' ) ); $scripts->add( 'admin-categories', "/wp-admin/js/categories$suffix.js", array('wp-lists'), '20091201' ); @@ -296,7 +296,7 @@ $scripts->localize( 'admin-tags', 'tagsl10n', array( 'noPerm' => __('You do not have permission to do that.'), 'broken' => __('An unidentified error has occurred.'), - 'l10n_print_after' => 'try{convertEntities(tagsl10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(tagsl10n);}' )); $scripts->add( 'admin-custom-fields', "/wp-admin/js/custom-fields$suffix.js", array('wp-lists'), '20090106' ); @@ -307,7 +307,7 @@ $scripts->localize( 'list-table', 'listTableL10n', array( 'error' => __('An error has occurred while loading the items.'), 'search' => __('Search results for “%s”'), - 'l10n_print_after' => 'try{convertEntities(listTableL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(listTableL10n);}' ) ); $scripts->add( 'admin-comments', "/wp-admin/js/edit-comments$suffix.js", array('wp-lists', 'list-table', 'jquery-ui-resizable', 'quicktags'), '20101223' ); @@ -349,7 +349,7 @@ 'password' => __('Password Protected'), 'privatelyPublished' => __('Privately Published'), 'published' => __('Published'), - 'l10n_print_after' => 'try{convertEntities(postL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(postL10n);}' ) ); $scripts->add( 'link', "/wp-admin/js/link$suffix.js", array('wp-lists', 'postbox'), '20090526' ); @@ -361,7 +361,7 @@ 'cancel' => __('Cancel'), 'edit' => __('Edit'), 'submittedOn' => __('Submitted on:'), - 'l10n_print_after' => 'try{convertEntities(commentL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(commentL10n);}' ) ); $scripts->add( 'admin-gallery', "/wp-admin/js/gallery$suffix.js", array( 'jquery-ui-sortable' ), '20090516' ); @@ -376,7 +376,7 @@ $scripts->add_data( 'word-count', 'group', 1 ); $scripts->localize( 'word-count', 'wordCountL10n', array( 'count' => __('Word count: %d'), - 'l10n_print_after' => 'try{convertEntities(wordCountL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(wordCountL10n);}' )); $scripts->add( 'theme', "/wp-admin/js/theme$suffix.js", array( 'thickbox', 'list-table' ), '20101123' ); @@ -391,14 +391,14 @@ 'error' => __('Error while saving the changes.'), 'ntdeltitle' => __('Remove From Bulk Edit'), 'notitle' => __('(no title)'), - 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(inlineEditL10n);}' ) ); $scripts->add( 'inline-edit-tax', "/wp-admin/js/inline-edit-tax$suffix.js", array( 'jquery' ), '20100615' ); $scripts->add_data( 'inline-edit-tax', 'group', 1 ); $scripts->localize( 'inline-edit-tax', 'inlineEditL10n', array( 'error' => __('Error while saving the changes.'), - 'l10n_print_after' => 'try{convertEntities(inlineEditL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(inlineEditL10n);}' ) ); $scripts->add( 'plugin-install', "/wp-admin/js/plugin-install$suffix.js", array( 'jquery', 'thickbox' ), '20110113' ); @@ -406,7 +406,7 @@ $scripts->localize( 'plugin-install', 'plugininstallL10n', array( 'plugin_information' => __('Plugin Information:'), 'ays' => __('Are you sure you want to install this plugin?'), - 'l10n_print_after' => 'try{convertEntities(plugininstallL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(plugininstallL10n);}' ) ); $scripts->add( 'farbtastic', '/wp-admin/js/farbtastic.js', array('jquery'), '1.2' ); @@ -432,7 +432,7 @@ 'saving' => __( 'Saving...' ), 'error' => __( 'Could not set that as the thumbnail image. Try a different attachment.' ), 'done' => __( 'Done' ), - 'l10n_print_after' => 'try{convertEntities(setPostThumbnailL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(setPostThumbnailL10n);}' ) ); // Navigation Menus @@ -441,7 +441,7 @@ 'noResultsFound' => _x('No results found.', 'search results'), 'warnDeleteMenu' => __( "You are about to permanently delete this menu. \n 'Cancel' to stop, 'OK' to delete." ), 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'), - 'l10n_print_after' => 'try{convertEntities(navMenuL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(navMenuL10n);}' ) ); $scripts->add( 'custom-background', "/wp-admin/js/custom-background$suffix.js", array('farbtastic'), '20101025' ); @@ -565,7 +565,7 @@ 'requestFile' => admin_url('admin-ajax.php'), 'savingText' => __('Saving Draft…'), 'saveAlert' => __('The changes you made will be lost if you navigate away from this page.'), - 'l10n_print_after' => 'try{convertEntities(autosaveL10n);}catch(e){};' + 'l10n_print_after' => 'if (typeof convertEntities=="function"){convertEntities(autosaveL10n);}' ) ); } Index: wp-admin/install.php =================================================================== --- wp-admin/install.php (revision 17295) +++ wp-admin/install.php (working copy) @@ -257,7 +257,7 @@ strong: "", mismatch: "" }; -try{convertEntities(pwsL10n);}catch(e){}; +if (typeof convertEntities=="function"){convertEntities(pwsL10n);} /* ]]> */