diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/error_log /home/packages/code/qi/SOURCES/wordpress-3.5.2/error_log *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/error_log 2013-05-22 14:00:21.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/error_log 1969-12-31 18:00:00.000000000 -0600 *************** *** 1,6 **** - [16-May-2013 09:31:53] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 - [16-May-2013 16:25:09] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 - [16-May-2013 22:43:37] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 - [17-May-2013 01:18:11] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 - [17-May-2013 07:26:56] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 - [22-May-2013 14:00:21] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 --- 0 ---- diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/readme.html /home/packages/code/qi/SOURCES/wordpress-3.5.2/readme.html *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/readme.html 2013-01-24 14:50:28.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/readme.html 2013-06-21 12:26:11.000000000 -0500 *************** *** 8,14 ****

WordPress !
Version 3.5.1

Semantic Personal Publishing Platform

--- 8,14 ----

WordPress !
Version 3.5.2

Semantic Personal Publishing Platform

diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/about.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/about.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/about.php 2013-01-24 14:50:28.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/about.php 2013-06-21 12:26:11.000000000 -0500 *************** *** 34,40 ****
!

Version %1$s addressed some security issues and fixed %2$s bug.', 'Version %1$s addressed some security issues and fixed %2$s bugs.', 37 ), '3.5.1', number_format_i18n( 37 ) ); ?> the release notes.' ), 'http://codex.wordpress.org/Version_3.5.1' ); ?> --- 34,44 ----

!

!

Version %1$s addressed some security issues and fixed %2$s bug.', ! 'Version %1$s addressed some security issues and fixed %2$s bugs.', 12 ), '3.5.2', number_format_i18n( 12 ) ); ?> ! the release notes.' ), 'http://codex.wordpress.org/Version_3.5.2' ); ?> !

Version %1$s addressed some security issues and fixed %2$s bug.', 'Version %1$s addressed some security issues and fixed %2$s bugs.', 37 ), '3.5.1', number_format_i18n( 37 ) ); ?> the release notes.' ), 'http://codex.wordpress.org/Version_3.5.1' ); ?> diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/edit-form-advanced.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/edit-form-advanced.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/edit-form-advanced.php 2012-12-05 18:41:06.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/edit-form-advanced.php 2013-06-20 21:50:58.000000000 -0500 *************** *** 144,150 **** if ( post_type_supports($post_type, 'custom-fields') ) add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core'); ! do_action('dbx_post_advanced'); if ( post_type_supports($post_type, 'comments') ) add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core'); --- 144,150 ---- if ( post_type_supports($post_type, 'custom-fields') ) add_meta_box('postcustom', __('Custom Fields'), 'post_custom_meta_box', null, 'normal', 'core'); ! do_action('dbx_post_advanced', $post); if ( post_type_supports($post_type, 'comments') ) add_meta_box('commentstatusdiv', __('Discussion'), 'post_comment_status_meta_box', null, 'normal', 'core'); *************** *** 296,302 ****

!
> --- 296,302 ----

! > *************** *** 354,360 **** --- 354,360 ---- *************** *** 383,398 ****
!
!
--- 414,420 ---- diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/error_log /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/error_log *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/error_log 2013-04-29 14:17:35.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/error_log 2013-06-25 11:56:39.000000000 -0500 *************** *** 1,48 **** ! [29-Apr-2013 14:11:59] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:12:00] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:12:10] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:13:35] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:13:37] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:13:58] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:25] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:26] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:28] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:29] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:29] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:29] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:30] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:30] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:33] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:36] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:42] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:45] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:47] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:54] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:58] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:14:59] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:02] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:04] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:09] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:13] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:23] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:30] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:34] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:15:36] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:16:07] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:16:14] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:16:23] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:06] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:14] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:15] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:20] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:23] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [29-Apr-2013 14:17:35] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 --- 1,46 ---- ! [25-Jun-2013 11:50:08] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:50:09] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:50:09] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:50:19] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:50:27] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:50:29] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:21] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:30] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:31] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:32] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:33] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:33] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:33] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:33] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:34] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:34] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:35] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:36] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:36] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:36] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:38] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:39] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:45] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:51] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:54] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:51:56] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:52:01] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:52:53] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:53:37] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:53:48] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:53:54] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:53:57] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:54:17] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:54:22] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:54:24] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:54:42] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:54:44] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:55:15] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:55:25] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:55:46] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:56:37] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:56:37] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 ! [25-Jun-2013 11:56:39] PHP Warning: Xdebug MUST be loaded as a Zend extension in Unknown on line 0 diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/class-wp-importer.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/class-wp-importer.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/class-wp-importer.php 2012-10-04 07:40:09.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/class-wp-importer.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 183,188 **** --- 183,189 ---- $headers = array(); $args = array(); + $args['reject_unsafe_urls'] = true; if ( true === $head ) $args['method'] = 'HEAD'; if ( !empty( $username ) && !empty( $password ) ) diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/class-wp-upgrader.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/class-wp-upgrader.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/class-wp-upgrader.php 2012-09-26 14:57:44.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/class-wp-upgrader.php 2013-06-21 00:55:56.000000000 -0500 *************** *** 98,104 **** break; default: if ( ! $wp_filesystem->find_folder($dir) ) ! return new WP_Error('fs_no_folder', sprintf($this->strings['fs_no_folder'], $dir)); break; } } --- 98,104 ---- break; default: if ( ! $wp_filesystem->find_folder($dir) ) ! return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) ); break; } } *************** *** 1133,1139 **** } elseif ( is_wp_error($errors) && $errors->get_error_code() ) { foreach ( $errors->get_error_messages() as $message ) { if ( $errors->get_error_data() ) ! $this->feedback($message . ' ' . $errors->get_error_data() ); else $this->feedback($message); } --- 1133,1139 ---- } elseif ( is_wp_error($errors) && $errors->get_error_code() ) { foreach ( $errors->get_error_messages() as $message ) { if ( $errors->get_error_data() ) ! $this->feedback($message . ' ' . esc_html( $errors->get_error_data() ) ); else $this->feedback($message); } *************** *** 1147,1154 **** if ( strpos($string, '%') !== false ) { $args = func_get_args(); $args = array_splice($args, 1); ! if ( !empty($args) ) $string = vsprintf($string, $args); } if ( empty($string) ) return; --- 1147,1157 ---- if ( strpos($string, '%') !== false ) { $args = func_get_args(); $args = array_splice($args, 1); ! if ( $args ) { ! $args = array_map( 'strip_tags', $args ); ! $args = array_map( 'esc_html', $args ); $string = vsprintf($string, $args); + } } if ( empty($string) ) return; *************** *** 1188,1198 **** function after() { $this->plugin = $this->upgrader->plugin_info(); if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ ! echo ''; } $update_actions = array( ! 'activate_plugin' => '' . __('Activate Plugin') . '', 'plugins_page' => '' . __('Return to Plugins page') . '' ); if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) --- 1191,1201 ---- function after() { $this->plugin = $this->upgrader->plugin_info(); if ( !empty($this->plugin) && !is_wp_error($this->result) && $this->plugin_active ){ ! echo ''; } $update_actions = array( ! 'activate_plugin' => '' . __('Activate Plugin') . '', 'plugins_page' => '' . __('Return to Plugins page') . '' ); if ( $this->plugin_active || ! $this->result || is_wp_error( $this->result ) || ! current_user_can( 'activate_plugins' ) ) *************** *** 1244,1251 **** if ( strpos($string, '%') !== false ) { $args = func_get_args(); $args = array_splice($args, 1); ! if ( !empty($args) ) $string = vsprintf($string, $args); } if ( empty($string) ) return; --- 1247,1257 ---- if ( strpos($string, '%') !== false ) { $args = func_get_args(); $args = array_splice($args, 1); ! if ( $args ) { ! $args = array_map( 'strip_tags', $args ); ! $args = array_map( 'esc_html', $args ); $string = vsprintf($string, $args); + } } if ( empty($string) ) return; *************** *** 1269,1275 **** if ( is_wp_error($error) ) { foreach ( $error->get_error_messages() as $emessage ) { if ( $error->get_error_data() ) ! $messages[] = $emessage . ' ' . $error->get_error_data(); else $messages[] = $emessage; } --- 1275,1281 ---- if ( is_wp_error($error) ) { foreach ( $error->get_error_messages() as $emessage ) { if ( $error->get_error_data() ) ! $messages[] = $emessage . ' ' . esc_html( $error->get_error_data() ); else $messages[] = $emessage; } *************** *** 1430,1441 **** $from = isset($_GET['from']) ? stripslashes($_GET['from']) : 'plugins'; if ( 'import' == $from ) ! $install_actions['activate_plugin'] = '' . __('Activate Plugin & Run Importer') . ''; else ! $install_actions['activate_plugin'] = '' . __('Activate Plugin') . ''; if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { ! $install_actions['network_activate'] = '' . __('Network Activate') . ''; unset( $install_actions['activate_plugin'] ); } --- 1436,1447 ---- $from = isset($_GET['from']) ? stripslashes($_GET['from']) : 'plugins'; if ( 'import' == $from ) ! $install_actions['activate_plugin'] = '' . __('Activate Plugin & Run Importer') . ''; else ! $install_actions['activate_plugin'] = '' . __('Activate Plugin') . ''; if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { ! $install_actions['network_activate'] = '' . __('Network Activate') . ''; unset( $install_actions['activate_plugin'] ); } *************** *** 1670,1673 **** return true; } ! } \ No newline at end of file --- 1676,1679 ---- return true; } ! } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/file.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/file.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/file.php 2012-11-21 16:39:59.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/file.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 328,335 **** // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; ! if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) ! return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) ); // Set correct file permissions $stat = stat( dirname( $new_file )); --- 328,341 ---- // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; ! if ( false === @ move_uploaded_file( $file['tmp_name'], $new_file ) ) { ! if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) ! $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir']; ! else ! $error_path = basename( $uploads['basedir'] ) . $uploads['subdir']; ! ! return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) ); ! } // Set correct file permissions $stat = stat( dirname( $new_file )); *************** *** 452,458 **** // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; if ( false === @ rename( $file['tmp_name'], $new_file ) ) { ! return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $uploads['path'] ) ); } // Set correct file permissions --- 458,468 ---- // Move the file to the uploads dir $new_file = $uploads['path'] . "/$filename"; if ( false === @ rename( $file['tmp_name'], $new_file ) ) { ! if ( 0 === strpos( $uploads['basedir'], ABSPATH ) ) ! $error_path = str_replace( ABSPATH, '', $uploads['basedir'] ) . $uploads['subdir']; ! else ! $error_path = basename( $uploads['basedir'] ) . $uploads['subdir']; ! return $upload_error_handler( $file, sprintf( __('The uploaded file could not be moved to %s.' ), $error_path ) ); } // Set correct file permissions *************** *** 487,493 **** if ( ! $tmpfname ) return new WP_Error('http_no_file', __('Could not create Temporary file.')); ! $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) ); if ( is_wp_error( $response ) ) { unlink( $tmpfname ); --- 497,503 ---- if ( ! $tmpfname ) return new WP_Error('http_no_file', __('Could not create Temporary file.')); ! $response = wp_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname, 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) { unlink( $tmpfname ); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/media.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/media.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/media.php 2013-01-04 22:00:18.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/media.php 2013-06-20 21:50:58.000000000 -0500 *************** *** 2270,2278 **** * * @since 3.5.0 */ ! function edit_form_image_editor() { ! $post = get_post(); ! $open = isset( $_GET['image-editor'] ); if ( $open ) require_once ABSPATH . 'wp-admin/includes/image-edit.php'; --- 2270,2276 ---- * * @since 3.5.0 */ ! function edit_form_image_editor( $post ) { $open = isset( $_GET['image-editor'] ); if ( $open ) require_once ABSPATH . 'wp-admin/includes/image-edit.php'; diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/post.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/post.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/post.php 2012-12-05 23:34:17.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/post.php 2013-06-21 01:02:58.000000000 -0500 *************** *** 65,79 **** } } ! if ( ! $update && isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] ) && ! current_user_can( $ptype->cap->edit_others_posts ) ) { ! ! if ( 'page' == $post_data['post_type'] ) ! return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) ); ! else ! return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) ); } // What to do based on which button they pressed if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) $post_data['post_status'] = 'draft'; --- 65,88 ---- } } ! if ( isset( $post_data['user_ID'] ) && ( $post_data['post_author'] != $post_data['user_ID'] ) && ! current_user_can( $ptype->cap->edit_others_posts ) ) { ! if ( $update ) { ! if ( 'page' == $post_data['post_type'] ) ! return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) ); ! else ! return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) ); ! } else { ! if ( 'page' == $post_data['post_type'] ) ! return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) ); ! else ! return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) ); ! } } + if ( ! empty( $post_data['post_status'] ) ) + $post_data['post_status'] = sanitize_key( $post_data['post_status'] ); + // What to do based on which button they pressed if ( isset($post_data['saveasdraft']) && '' != $post_data['saveasdraft'] ) $post_data['post_status'] = 'draft'; *************** *** 92,101 **** $post_id = false; $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false; // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts. ! if ( isset($post_data['post_status']) && ('publish' == $post_data['post_status'] && !current_user_can( $ptype->cap->publish_posts )) ) ! if ( $previous_status != 'publish' || !current_user_can( 'edit_post', $post_id ) ) $post_data['post_status'] = 'pending'; if ( ! isset($post_data['post_status']) ) --- 101,112 ---- $post_id = false; $previous_status = $post_id ? get_post_field( 'post_status', $post_id ) : false; + $published_statuses = array( 'publish', 'future' ); + // Posts 'submitted for approval' present are submitted to $_POST the same as if they were being published. // Change status from 'publish' to 'pending' if user lacks permissions to publish or to resave published posts. ! if ( isset($post_data['post_status']) && (in_array( $post_data['post_status'], $published_statuses ) && !current_user_can( $ptype->cap->publish_posts )) ) ! if ( ! in_array( $previous_status, $published_statuses ) || !current_user_can( 'edit_post', $post_id ) ) $post_data['post_status'] = 'pending'; if ( ! isset($post_data['post_status']) ) diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/schema.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/schema.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/schema.php 2012-10-25 15:18:24.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/schema.php 2013-06-19 03:08:04.000000000 -0500 *************** *** 536,542 **** 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app', ! 'autoembed_urls', 'default_post_edit_rows', ); foreach ( $unusedoptions as $option ) delete_option($option); --- 536,542 ---- 'can_compress_scripts', 'page_uris', 'update_core', 'update_plugins', 'update_themes', 'doing_cron', 'random_seed', 'rss_excerpt_length', 'secret', 'use_linksupdate', 'default_comment_status_page', 'wporg_popular_tags', 'what_to_show', 'rss_language', 'language', 'enable_xmlrpc', 'enable_app', ! 'embed_autourls', 'default_post_edit_rows', ); foreach ( $unusedoptions as $option ) delete_option($option); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/update-core.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/update-core.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/update-core.php 2013-01-22 10:52:15.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/update-core.php 2013-06-21 04:29:58.000000000 -0500 *************** *** 536,541 **** --- 536,543 ---- 'wp-includes/js/jquery/ui/jquery.effects.transfer.min.js', 'wp-includes/js/jquery/ui/jquery.effects.fold.min.js', 'wp-admin/options-privacy.php', + // 3.5.2 + 'wp-includes/js/swfupload/swfupload-all.js', ); /** diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/upgrade.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/upgrade.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/includes/upgrade.php 2012-11-28 18:37:30.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/includes/upgrade.php 2013-06-19 17:12:36.000000000 -0500 *************** *** 1277,1282 **** --- 1277,1292 ---- // 3.5 if ( $wp_current_db_version < 21823 ) update_site_option( 'ms_files_rewriting', '1' ); + + // 3.5.2 + if ( $wp_current_db_version < 22442 ) { + $illegal_names = get_site_option( 'illegal_names' ); + if ( is_array( $illegal_names ) && count( $illegal_names ) === 1 ) { + $illegal_name = reset( $illegal_names ); + $illegal_names = explode( ' ', $illegal_name ); + update_site_option( 'illegal_names', $illegal_names ); + } + } } // The functions we use to actually do stuff diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/update.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/update.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-admin/update.php 2012-11-07 13:37:54.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-admin/update.php 2013-06-21 00:55:56.000000000 -0500 *************** *** 57,63 **** require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-plugin_' . $plugin; ! $url = 'update.php?action=upgrade-plugin&plugin=' . $plugin; $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) ); $upgrader->upgrade($plugin); --- 57,63 ---- require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-plugin_' . $plugin; ! $url = 'update.php?action=upgrade-plugin&plugin=' . urlencode( $plugin ); $upgrader = new Plugin_Upgrader( new Plugin_Upgrader_Skin( compact('title', 'nonce', 'url', 'plugin') ) ); $upgrader->upgrade($plugin); *************** *** 70,78 **** check_admin_referer('activate-plugin_' . $plugin); if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { ! wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) ); activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true ); ! wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . $plugin . '&_wpnonce=' . $_GET['_wpnonce']) ); die(); } iframe_header( __('Plugin Reactivation'), true ); --- 70,78 ---- check_admin_referer('activate-plugin_' . $plugin); if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { ! wp_redirect( admin_url('update.php?action=activate-plugin&failure=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) ); activate_plugin( $plugin, '', ! empty( $_GET['networkwide'] ), true ); ! wp_redirect( admin_url('update.php?action=activate-plugin&success=true&plugin=' . urlencode( $plugin ) . '&_wpnonce=' . $_GET['_wpnonce']) ); die(); } iframe_header( __('Plugin Reactivation'), true ); *************** *** 107,113 **** $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-plugin_' . $plugin; ! $url = 'update.php?action=install-plugin&plugin=' . $plugin; if ( isset($_GET['from']) ) $url .= '&from=' . urlencode(stripslashes($_GET['from'])); --- 107,113 ---- $title = sprintf( __('Installing Plugin: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-plugin_' . $plugin; ! $url = 'update.php?action=install-plugin&plugin=' . urlencode( $plugin ); if ( isset($_GET['from']) ) $url .= '&from=' . urlencode(stripslashes($_GET['from'])); *************** *** 132,138 **** $submenu_file = 'plugin-install.php'; require_once(ABSPATH . 'wp-admin/admin-header.php'); ! $title = sprintf( __('Installing Plugin from uploaded file: %s'), basename( $file_upload->filename ) ); $nonce = 'plugin-upload'; $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin'); $type = 'upload'; //Install plugin type, From Web or an Upload. --- 132,138 ---- $submenu_file = 'plugin-install.php'; require_once(ABSPATH . 'wp-admin/admin-header.php'); ! $title = sprintf( __('Installing Plugin from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'plugin-upload'; $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-plugin'); $type = 'upload'; //Install plugin type, From Web or an Upload. *************** *** 160,166 **** require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-theme_' . $theme; ! $url = 'update.php?action=upgrade-theme&theme=' . $theme; $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) ); $upgrader->upgrade($theme); --- 160,166 ---- require_once(ABSPATH . 'wp-admin/admin-header.php'); $nonce = 'upgrade-theme_' . $theme; ! $url = 'update.php?action=upgrade-theme&theme=' . urlencode( $theme ); $upgrader = new Theme_Upgrader( new Theme_Upgrader_Skin( compact('title', 'nonce', 'url', 'theme') ) ); $upgrader->upgrade($theme); *************** *** 213,219 **** $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-theme_' . $theme; ! $url = 'update.php?action=install-theme&theme=' . $theme; $type = 'web'; //Install theme type, From Web or an Upload. $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) ); --- 213,219 ---- $title = sprintf( __('Installing Theme: %s'), $api->name . ' ' . $api->version ); $nonce = 'install-theme_' . $theme; ! $url = 'update.php?action=install-theme&theme=' . urlencode( $theme ); $type = 'web'; //Install theme type, From Web or an Upload. $upgrader = new Theme_Upgrader( new Theme_Installer_Skin( compact('title', 'url', 'nonce', 'plugin', 'api') ) ); *************** *** 238,244 **** require_once(ABSPATH . 'wp-admin/admin-header.php'); ! $title = sprintf( __('Installing Theme from uploaded file: %s'), basename( $file_upload->filename ) ); $nonce = 'theme-upload'; $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme'); $type = 'upload'; //Install plugin type, From Web or an Upload. --- 238,244 ---- require_once(ABSPATH . 'wp-admin/admin-header.php'); ! $title = sprintf( __('Installing Theme from uploaded file: %s'), esc_html( basename( $file_upload->filename ) ) ); $nonce = 'theme-upload'; $url = add_query_arg(array('package' => $file_upload->id), 'update.php?action=upload-theme'); $type = 'upload'; //Install plugin type, From Web or an Upload. diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/admin.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/admin.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/admin.php 2012-12-12 12:10:47.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/admin.php 2013-06-20 12:59:08.000000000 -0500 *************** *** 10,18 **** if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) { function akismet_version_warning() { ! echo " !

".sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) ." ".sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). "

! "; } add_action('admin_notices', 'akismet_version_warning'); --- 10,18 ---- if ( !function_exists('is_multisite') && version_compare( $wp_version, '3.0', '<' ) ) { function akismet_version_warning() { ! echo ' !

'.sprintf(__('Akismet %s requires WordPress 3.0 or higher.'), AKISMET_VERSION) .' '.sprintf(__('Please upgrade WordPress to a current version, or downgrade to version 2.4 of the Akismet plugin.'), 'http://codex.wordpress.org/Upgrading_WordPress', 'http://wordpress.org/extend/plugins/akismet/download/'). '

! '; } add_action('admin_notices', 'akismet_version_warning'); *************** *** 31,43 **** function akismet_load_js_and_css() { global $hook_suffix; ! if ( ! $hook_suffix == 'index.php' # dashboard ! || $hook_suffix == 'edit-comments.php' ! || $hook_suffix == 'comment.php' ! || $hook_suffix == 'post.php' ! || $hook_suffix == 'plugins_page_akismet-key-config' ! ) { wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.4.4' ); wp_enqueue_style( 'akismet.css'); --- 31,44 ---- function akismet_load_js_and_css() { global $hook_suffix; ! if ( in_array( $hook_suffix, array( ! 'index.php', # dashboard ! 'edit-comments.php', ! 'comment.php', ! 'post.php', ! 'plugins_page_akismet-key-config', ! 'jetpack_page_akismet-key-config', ! ) ) ) { wp_register_style( 'akismet.css', AKISMET_PLUGIN_URL . 'akismet.css', array(), '2.5.4.4' ); wp_enqueue_style( 'akismet.css'); *************** *** 64,98 **** add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 ); function akismet_conf() { ! global $akismet_nonce, $wpcom_api_key; ! if ( isset($_POST['submit']) ) { if ( function_exists('current_user_can') && !current_user_can('manage_options') ) die(__('Cheatin’ uh?')); check_admin_referer( $akismet_nonce ); ! $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] ); $home_url = parse_url( get_bloginfo('url') ); ! ! if ( empty($key) ) { ! $key_status = 'empty'; ! $ms[] = 'new_key_empty'; ! delete_option('wordpress_api_key'); ! } elseif ( empty($home_url['host']) ) { ! $key_status = 'empty'; $ms[] = 'bad_home_url'; ! } else { $key_status = akismet_verify_key( $key ); - } ! if ( $key_status == 'valid' ) { update_option('wordpress_api_key', $key); $ms[] = 'new_key_valid'; ! } else if ( $key_status == 'invalid' ) { $ms[] = 'new_key_invalid'; ! } else if ( $key_status == 'failed' ) { $ms[] = 'new_key_failed'; ! } if ( isset( $_POST['akismet_discard_month'] ) ) update_option( 'akismet_discard_month', 'true' ); --- 65,115 ---- add_filter( 'plugin_action_links', 'akismet_plugin_action_links', 10, 2 ); function akismet_conf() { ! global $akismet_nonce, $current_user; ! ! $new_key_link = 'https://akismet.com/get/'; ! $api_key = akismet_get_key(); ! $show_key_form = $api_key; ! $key_status = 'empty'; ! $saved_ok = false; ! ! $ms = array(); ! if ( isset( $_POST['submit'] ) ) { if ( function_exists('current_user_can') && !current_user_can('manage_options') ) die(__('Cheatin’ uh?')); + + $show_key_form = true; check_admin_referer( $akismet_nonce ); ! $key = preg_replace( '/[^a-h0-9]/i', '', $_POST['key'] ); $home_url = parse_url( get_bloginfo('url') ); ! ! if ( empty( $home_url['host'] ) ) $ms[] = 'bad_home_url'; ! ! if ( empty( $key ) ) { ! if ( $api_key ) { ! delete_option('wordpress_api_key'); ! $saved_ok = true; ! $ms[] = 'new_key_empty'; ! } ! else ! $ms[] = 'key_empty'; ! } ! else $key_status = akismet_verify_key( $key ); ! if ( $key != $api_key && $key_status == 'valid' ) { update_option('wordpress_api_key', $key); $ms[] = 'new_key_valid'; ! } ! elseif ( $key_status == 'invalid' ) $ms[] = 'new_key_invalid'; ! elseif ( $key_status == 'failed' ) $ms[] = 'new_key_failed'; ! ! $api_key = $key_status == 'valid' ? $key : false; if ( isset( $_POST['akismet_discard_month'] ) ) update_option( 'akismet_discard_month', 'true' ); *************** *** 103,259 **** update_option( 'akismet_show_user_comments_approved', 'true' ); else update_option( 'akismet_show_user_comments_approved', 'false' ); ! ! } elseif ( isset($_POST['check']) ) { akismet_get_server_connectivity(0); } ! ! if ( empty( $key_status) || $key_status != 'valid' ) { ! $key = get_option('wordpress_api_key'); ! if ( empty( $key ) ) { ! if ( empty( $key_status ) || $key_status != 'failed' ) { ! if ( akismet_verify_key( '1234567890ab' ) == 'failed' ) ! $ms[] = 'no_connection'; ! else ! $ms[] = 'key_empty'; ! } ! $key_status = 'empty'; ! } else { ! $key_status = akismet_verify_key( $key ); ! } ! if ( $key_status == 'valid' ) { ! $ms[] = 'key_valid'; ! } else if ( $key_status == 'invalid' ) { ! $ms[] = 'key_invalid'; ! } else if ( !empty($key) && $key_status == 'failed' ) { ! $ms[] = 'key_failed'; } } $messages = array( ! 'new_key_empty' => array('color' => 'aa0', 'text' => __('Your key has been cleared.')), ! 'new_key_valid' => array('color' => '4AB915', 'text' => __('Your key has been verified. Happy blogging!')), ! 'new_key_invalid' => array('color' => '888', 'text' => __('The key you entered is invalid. Please double-check it.')), ! 'new_key_failed' => array('color' => '888', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.')), ! 'no_connection' => array('color' => '888', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.')), ! 'key_empty' => array('color' => 'aa0', 'text' => sprintf(__('Please enter an API key. (Get your key.)'), 'http://akismet.com/get/?return=true')), ! 'key_valid' => array('color' => '4AB915', 'text' => __('This key is valid.')), ! 'key_invalid' => array('color' => '888', 'text' => __('This key is invalid.')), ! 'key_failed' => array('color' => 'aa0', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.')), ! 'bad_home_url' => array('color' => '888', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the home option.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ), ); ?> - -

- -
-

- -

Sign up success! Please check your email for your Akismet API Key and enter it below.' ); ?>

- -
- - -

Akismet will greatly reduce or even completely eliminate the comment and trackback spam you get on your site. If one does happen to get through, simply mark it as "spam" on the moderation screen and Akismet will learn from the mistakes. If you don\'t have an API key yet, you can get one at Akismet.com.'), 'http://akismet.com/?return=true', 'http://akismet.com/get/?return=true'); ?>

- -

- -

- -

(What is this?'); ?>)

- -

-

- - - -

-

-

- - -
-

- -

-

fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- 0 ) { - // some connections work, some fail - if ( $fail_count > 0 && $fail_count < count($servers) ) { ?> -

-

this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- 0 ) { ?> -

-

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- -

-

- -

-

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

- - - - - $status ) { - $color = ( $status ? '#4AB915' : '#888'); - ?> - - - - - - -
-

-

-

Click here to confirm that Akismet.com is up.'), 'http://status.automattic.com/9931/136079/Akismet-API', 'http://status.automattic.com/9931/136079/Akismet-API' ); ?>

-
!
!
! !
! array( 'class' => 'updated fade', 'text' => __('Your key has been cleared.' ) ), ! 'new_key_valid' => array( 'class' => 'updated fade', 'text' => __('Your Akismet account has been successfully set up and activated. Happy blogging!' ) ), ! 'new_key_invalid' => array( 'class' => 'error', 'text' => __('The key you entered is invalid. Please double-check it.' ) ), ! 'new_key_failed' => array( 'class' => 'error', 'text' => __('The key you entered could not be verified because a connection to akismet.com could not be established. Please check your server configuration.' ) ), ! 'no_connection' => array( 'class' => 'error', 'text' => __('There was a problem connecting to the Akismet server. Please check your server configuration.' ) ), ! 'key_empty' => array( 'class' => 'updated fade', 'text' => __('Please enter an API key' ) ), ! 'key_invalid' => array( 'class' => 'error', 'text' => __('This key is invalid.' ) ), ! 'key_failed' => array( 'class' => 'error', 'text' => __('The key below was previously validated but a connection to akismet.com can not be established at this time. Please check your server configuration.' ) ), ! 'bad_home_url' => array( 'class' => 'error', 'text' => sprintf( __('Your WordPress home URL %s is invalid. Please fix the home option.'), esc_html( get_bloginfo('url') ), admin_url('options.php#home') ) ) ); ?> !
! !

! !

Stats' ), esc_url( add_query_arg( array( 'page' => 'akismet-stats-display' ), class_exists( 'Jetpack' ) ? admin_url( 'admin.php' ) : admin_url( 'index.php' ) ) ) ); ?>

! !
!

!
! ! ! ! !
!
! !
!
! !

! ! !

Sign up success! Please check your email for your Akismet API Key and enter it below.') ?>

! ! !

! !
! ! ! ! ! ! ! ! ! ! ! ! ! !
!
!

create one here'), '#' );?>

!
!
!
! !
!
! !

! !

!
! ! !

!
! ! ! ! ! ! ! ! ! ! ! ! ! ! ! ! !
! !

!

fsockopen or gethostbynamel functions. Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet\'s system requirements.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

! 0 ) { ! if ( $fail_count > 0 && $fail_count < count( $servers ) ) { // some connections work, some fail ?> !

!

this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

! 0 ) { // all connections fail ?> !

!

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

! !

!

! !

!

Akismet cannot work correctly until this is fixed. Please contact your web host or firewall administrator and give them this information about Akismet and firewalls.'), 'http://blog.akismet.com/akismet-hosting-faq/'); ?>

! !
! ! ! ! ! ! $status ) : ?> ! ! ! ! ! ! !
!
! !
!

!

clicking here.'), 'http://status.automattic.com/9931/136079/Akismet-API' ); ?>

!
! !
! !
! !
!

enter your Akismet API key for it to work.' ), esc_url( add_query_arg( array( 'page' => 'akismet-key-config' ), admin_url( 'admin.php' ) ) ) );?>

! !
!

Akismet Error Code:

!

More information is available at https://akismet.com/errors/

!

:

!

%s' , 'https://akismet.com/errors/'.$alert['code'], 'https://akismet.com/errors/'.$alert['code'] );?> !

".__('Akismet is almost ready.')." ".sprintf(__('You must enter your Akismet API key for it to work.'), "admin.php?page=akismet-key-config")."

! "; } add_action('admin_notices', 'akismet_warning'); return; } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) && wp_next_scheduled('akismet_schedule_cron_recheck') ) { --- 360,392 ---- if ( !get_option('wordpress_api_key') && !$wpcom_api_key && !isset($_POST['submit']) ) { function akismet_warning() { ! global $hook_suffix, $current_user; ! ! if ( $hook_suffix == 'plugins.php' ) { ! echo ' !
! !
! ! ! !
!
A
!
!
!
Activate your Akismet account
!
!
!
Almost done - activate your account and say goodbye to comment spam.
!
!
!
! '; ! } } + add_action('admin_notices', 'akismet_warning'); return; } elseif ( ( empty($_SERVER['SCRIPT_FILENAME']) || basename($_SERVER['SCRIPT_FILENAME']) == 'edit-comments.php' ) && wp_next_scheduled('akismet_schedule_cron_recheck') ) { *************** *** 314,322 **** $waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ); $next_check = wp_next_scheduled('akismet_schedule_cron_recheck'); if ( $waiting > 0 && $next_check > time() ) ! echo " !

".__('Akismet has detected a problem.')." ".sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config')."

! "; } add_action('admin_notices', 'akismet_warning'); return; --- 396,404 ---- $waiting = $wpdb->get_var( "SELECT COUNT(*) FROM $wpdb->commentmeta WHERE meta_key = 'akismet_error'" ); $next_check = wp_next_scheduled('akismet_schedule_cron_recheck'); if ( $waiting > 0 && $next_check > time() ) ! echo ' !

'.__('Akismet has detected a problem.').' '.sprintf(__('Some comments have not yet been checked for spam by Akismet. They have been temporarily held for moderation. Please check your Akismet configuration and contact your web host if problems persist.'), 'admin.php?page=akismet-key-config').'

! '; } add_action('admin_notices', 'akismet_warning'); return; *************** *** 332,339 **** return $a; $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true ); ! $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true ); ! $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true); $comment_status = wp_get_comment_status( $comment->comment_ID ); $desc = null; if ( $akismet_error ) { --- 414,421 ---- return $a; $akismet_result = get_comment_meta( $comment->comment_ID, 'akismet_result', true ); ! $akismet_error = get_comment_meta( $comment->comment_ID, 'akismet_error', true ); ! $user_result = get_comment_meta( $comment->comment_ID, 'akismet_user_result', true); $comment_status = wp_get_comment_status( $comment->comment_ID ); $desc = null; if ( $akismet_error ) { *************** *** 369,375 **** } if ( $desc ) ! echo ''.htmlspecialchars($desc).''; if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) { $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url ); --- 451,457 ---- } if ( $desc ) ! echo ''.esc_html( $desc ).''; if ( apply_filters( 'akismet_show_user_comments_approved', get_option('akismet_show_user_comments_approved') ) == 'true' ) { $comment_count = akismet_get_user_comments_approved( $comment->user_id, $comment->comment_author_email, $comment->comment_author, $comment->comment_author_url ); *************** *** 390,396 **** foreach ( $history as $row ) { $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT'; echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . ' - '; ! echo htmlspecialchars( $row['message'] ) . '
'; } echo ''; --- 472,478 ---- foreach ( $history as $row ) { $time = date( 'D d M Y @ h:i:m a', $row['time'] ) . ' GMT'; echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . ' - '; ! echo esc_html( $row['message'] ) . '
'; } echo ''; *************** *** 418,424 **** echo '
'; foreach ( $history as $row ) { echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '
'; ! echo '
' . htmlspecialchars( $row['message'] ) . '
'; } echo '
'; --- 500,506 ---- echo '
'; foreach ( $history as $row ) { echo '
' . sprintf( __('%s ago'), human_time_diff( $row['time'] ) ) . '
'; ! echo '
' . esc_html( $row['message'] ) . '
'; } echo '
'; *************** *** 430,447 **** // END FIXME // call out URLS in comments ! function akismet_text_add_link_callback( $m ) { ! ! // bare link? ! if ( $m[4] == $m[2] ) ! return ''.$m[4].''; ! else ! return ''.$m[4].''; } function akismet_text_add_link_class( $comment_text ) { ! ! return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', 'akismet_text_add_link_callback', $comment_text ); } add_filter('comment_text', 'akismet_text_add_link_class'); --- 512,527 ---- // END FIXME // call out URLS in comments ! function akismet_text_add_link_callback( $m ) { ! // bare link? ! if ( $m[4] == $m[2] ) ! return ''.$m[4].''; ! else ! return ''.$m[4].''; } function akismet_text_add_link_class( $comment_text ) { ! return preg_replace_callback( '#]*)href="([^"]+)"([^>]*)>(.*?)#i', 'akismet_text_add_link_callback', $comment_text ); } add_filter('comment_text', 'akismet_text_add_link_class'); *************** *** 516,522 **** $comment->blog_lang = get_locale(); $comment->blog_charset = get_option('blog_charset'); $comment->permalink = get_permalink($comment->comment_post_ID); - $comment->reporter_ip = $_SERVER['REMOTE_ADDR']; if ( is_object($current_user) ) { $comment->reporter = $current_user->user_login; } --- 596,601 ---- *************** *** 568,574 **** $comment->blog_lang = get_locale(); $comment->blog_charset = get_option('blog_charset'); $comment->permalink = get_permalink($comment->comment_post_ID); - $comment->reporter_ip = $_SERVER['REMOTE_ADDR']; if ( is_object($current_user) ) { $comment->reporter = $current_user->user_login; } --- 647,652 ---- *************** *** 822,833 **** } } ! function akismet_load_menu() { if ( class_exists( 'Jetpack' ) ) { ! add_submenu_page( 'jetpack', __( 'Akismet Configuration' ), __( 'Akismet Configuration' ), 'manage_options', 'akismet-key-config', 'akismet_conf' ); add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' ); } else { ! add_submenu_page('plugins.php', __('Akismet Configuration'), __('Akismet Configuration'), 'manage_options', 'akismet-key-config', 'akismet_conf'); add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display'); } } --- 900,911 ---- } } ! function akismet_load_menu() { if ( class_exists( 'Jetpack' ) ) { ! add_submenu_page( 'jetpack', __( 'Akismet' ), __( 'Akismet' ), 'manage_options', 'akismet-key-config', 'akismet_conf' ); add_submenu_page( 'jetpack', __( 'Akismet Stats' ), __( 'Akismet Stats' ), 'manage_options', 'akismet-stats-display', 'akismet_stats_display' ); } else { ! add_submenu_page('plugins.php', __('Akismet'), __('Akismet'), 'manage_options', 'akismet-key-config', 'akismet_conf'); add_submenu_page('index.php', __('Akismet Stats'), __('Akismet Stats'), 'manage_options', 'akismet-stats-display', 'akismet_stats_display'); } } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/akismet.css /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/akismet.css *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/akismet.css 2011-08-22 14:07:19.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/akismet.css 2013-05-21 06:47:43.000000000 -0500 *************** *** 1,12 **** ! #submitted-on { position: relative; } ! #the-comment-list .author .akismet-user-comment-count { display: inline; } ! #the-comment-list .author a span { text-decoration: none; color: #999; } ! #the-comment-list .remove_url { margin-left: 3px; color: #999; padding: 2px 3px 2px 0; } ! #the-comment-list .remove_url:hover { color: #A7301F; font-weight: bold; padding: 2px 2px 2px 0; } ! #dashboard_recent_comments .akismet-status { display: none; } /* never show the flagged by text on the dashboard */ ! .akismet-status { float: right; } ! .akismet-status a { color: #AAA; font-style: italic; } ! span.comment-link a { text-decoration: underline; } ! span.comment-link:after { content: " " attr(title) " "; color: #aaa; text-decoration: none; } ! .mshot-arrow { width: 0; height: 0; border-top: 10px solid transparent; border-bottom: 10px solid transparent; border-right:10px solid #5C5C5C; position: absolute; left: -6px; top: 91px; } ! .mshot-container { background: #5C5C5C; position: absolute; top: -94px; padding: 7px; width: 450px; height: 338px; z-index: 20000; -moz-border-radius:6px; border-radius:6px; -webkit-border-radius:6px; } \ No newline at end of file --- 1 ---- ! #submitted-on{position:relative}#the-comment-list .author .akismet-user-comment-count{display:inline}#the-comment-list .author a span{text-decoration:none;color:#999}#the-comment-list .remove_url{margin-left:3px;color:#999;padding:2px 3px 2px 0}#the-comment-list .remove_url:hover{color:#A7301F;font-weight:bold;padding:2px 2px 2px 0}#dashboard_recent_comments .akismet-status{display:none}.akismet-status{float:right}.akismet-status a{color:#AAA;font-style:italic}span.comment-link a{text-decoration:underline}span.comment-link:after{content:" "attr(title) " ";color:#aaa;text-decoration:none}.mshot-arrow{width:0;height:0;border-top:10px solid transparent;border-bottom:10px solid transparent;border-right:10px solid #5C5C5C;position:absolute;left:-6px;top:91px}.mshot-container{background:#5C5C5C;position:absolute;top:-94px;padding:7px;width:450px;height:338px;z-index:20000;-moz-border-radius:6px;border-radius:6px;-webkit-border-radius:6px}h2.ak-header{padding-left:38px;background:url('img/logo.png') no-repeat 0 9px;margin-bottom:14px;line-height:32px}.key-status{padding:0.4em 1em;color:#fff;font-weight:bold;text-align:center;-webkit-border-radius:3px;border-radius:3px;border-width:1px;border-style:solid;max-width:23.3em}input#key{width:25.3em !important}input#key.valid{border-color:#4F800D}input#key.invalid,input#key.failed{border-color:#888}.key-status.under-input{margin-top:-5px;padding-bottom:0px}.key-status.invalid,.key-status.failed{background-color:#888}.key-status.valid{background-color:#4F800D}.key-status.some{background-color:#993300}.key-status.empty{display:none}table.network-status th,table.network-status td{padding:0.4em;margin:0;text-align:center}table.network-status{border-color:#dfdfdf;border-width:0 0 1px 1px;border-style:solid;border-spacing:0;width:25.6em}table.network-status th,table.network-status td{border-color:#dfdfdf;border-width:1px 1px 0 0;border-style:solid;margin:0;border-spacing:0}table.network-status td.key-status{border-radius:0px;-webkit-border-radius:0px} \ No newline at end of file diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/akismet.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/akismet.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/akismet.js 2012-12-13 08:58:11.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/akismet.js 2013-05-18 18:14:37.000000000 -0500 *************** *** 1,4 **** --- 1,16 ---- jQuery(document).ready(function () { + jQuery( '.switch-have-key' ).click( function() { + var no_key = jQuery( this ).parents().find('div.no-key'); + var have_key = jQuery( this ).parents().find('div.have-key'); + + no_key.addClass( 'hidden' ); + have_key.removeClass( 'hidden' ); + + return false; + }); + jQuery( 'p.need-key a' ).click( function(){ + document.akismet_activate.submit(); + }); jQuery('.akismet-status').each(function () { var thisId = jQuery(this).attr('commentid'); jQuery(this).prependTo('#comment-' + thisId + ' .column-comment div:first-child'); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/akismet.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/akismet.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/akismet.php 2012-12-13 15:08:41.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/akismet.php 2013-06-19 21:41:15.000000000 -0500 *************** *** 6,12 **** Plugin Name: Akismet Plugin URI: http://akismet.com/?return=true Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from comment and trackback spam. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) Sign up for an Akismet API key, and 3) Go to your Akismet configuration page, and save your API key. ! Version: 2.5.7 Author: Automattic Author URI: http://automattic.com/wordpress-plugins/ License: GPLv2 or later --- 6,12 ---- Plugin Name: Akismet Plugin URI: http://akismet.com/?return=true Description: Used by millions, Akismet is quite possibly the best way in the world to protect your blog from comment and trackback spam. It keeps your site protected from spam even while you sleep. To get started: 1) Click the "Activate" link to the left of this description, 2) Sign up for an Akismet API key, and 3) Go to your Akismet configuration page, and save your API key. ! Version: 2.5.8 Author: Automattic Author URI: http://automattic.com/wordpress-plugins/ License: GPLv2 or later *************** *** 34,40 **** exit; } ! define('AKISMET_VERSION', '2.5.7'); define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ )); /** If you hardcode a WP.com API key here, all key config screens will be hidden */ --- 34,40 ---- exit; } ! define('AKISMET_VERSION', '2.5.8'); define('AKISMET_PLUGIN_URL', plugin_dir_url( __FILE__ )); /** If you hardcode a WP.com API key here, all key config screens will be hidden */ diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/.htaccess /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/.htaccess *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/.htaccess 2012-12-12 23:48:36.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/.htaccess 2013-05-18 18:14:37.000000000 -0500 *************** *** 3,6 **** --- 3,11 ---- Allow from all + + + #allow access to any image + + Allow from all \ No newline at end of file diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/readme.txt /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/readme.txt *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/plugins/akismet/readme.txt 2012-12-13 15:08:41.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/plugins/akismet/readme.txt 2013-06-20 05:05:17.000000000 -0500 *************** *** 1,9 **** === Akismet === ! Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, automattic Tags: akismet, comments, spam Requires at least: 3.0 ! Tested up to: 3.5 ! Stable tag: 2.5.7 License: GPLv2 or later Akismet checks your comments against the Akismet web service to see if they look like spam or not. --- 1,9 ---- === Akismet === ! Contributors: matt, ryan, andy, mdawaffe, tellyworth, josephscott, lessbloat, eoigal, automattic Tags: akismet, comments, spam Requires at least: 3.0 ! Tested up to: 3.6 ! Stable tag: 2.5.8 License: GPLv2 or later Akismet checks your comments against the Akismet web service to see if they look like spam or not. *************** *** 31,36 **** --- 31,41 ---- == Changelog == + = 2.5.8 = + * Simplify the activation process for new users + * Remove the reporter_ip parameter + * Minor preventative security improvements + = 2.5.7 = * FireFox Stats iframe preview bug * Fix mshots preview when using https diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/themes/twentyeleven/languages/twentyeleven.pot /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/themes/twentyeleven/languages/twentyeleven.pot *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/themes/twentyeleven/languages/twentyeleven.pot 2012-12-31 18:19:40.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/themes/twentyeleven/languages/twentyeleven.pot 2013-04-26 08:58:43.000000000 -0500 *************** *** 4,10 **** msgstr "" "Project-Id-Version: Twenty Eleven 1.5\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyeleven\n" ! "POT-Creation-Date: 2013-01-01 00:19:40+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" --- 4,10 ---- msgstr "" "Project-Id-Version: Twenty Eleven 1.5\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentyeleven\n" ! "POT-Creation-Date: 2013-04-26 13:58:43+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" *************** *** 253,260 **** #: content-single.php:39 msgid "" ! "This entry was posted by %5$s. Bookmark the permalink." msgstr "" #: content-single.php:64 --- 253,260 ---- #: content-single.php:39 msgid "" ! "This entry was posted by %5$s. Bookmark the permalink." msgstr "" #: content-single.php:64 diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/themes/twentytwelve/languages/twentytwelve.pot /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/themes/twentytwelve/languages/twentytwelve.pot *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-content/themes/twentytwelve/languages/twentytwelve.pot 2012-12-31 18:19:44.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-content/themes/twentytwelve/languages/twentytwelve.pot 2013-04-26 08:58:47.000000000 -0500 *************** *** 4,10 **** msgstr "" "Project-Id-Version: Twenty Twelve 1.1\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentytwelve\n" ! "POT-Creation-Date: 2013-01-01 00:19:44+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" --- 4,10 ---- msgstr "" "Project-Id-Version: Twenty Twelve 1.1\n" "Report-Msgid-Bugs-To: http://wordpress.org/tags/twentytwelve\n" ! "POT-Creation-Date: 2013-04-26 13:58:46+00:00\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" *************** *** 240,245 **** --- 240,246 ---- msgid "Reply" msgstr "" + #. Translators: used between list items, there is a space after the comma. #: functions.php:332 functions.php:335 msgid ", " msgstr "" *************** *** 248,253 **** --- 249,256 ---- msgid "View all posts by %s" msgstr "" + #. Translators: 1 is category, 2 is tag, 3 is the date and 4 is the author's + #. name. #: functions.php:352 msgid "" "This entry was posted in %1$s and tagged %2$s on %3$sPublished at %4$s × %5" ! "$s in %8$s." msgstr "" #: image.php:41 --- 279,287 ---- msgid "" "Published at %4$s × " ! "%5$s in %8$s." msgstr "" #: image.php:41 diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-feed.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-feed.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-feed.php 2012-11-22 01:23:43.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-feed.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 66,72 **** $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE; if ( preg_match('/^http(s)?:\/\//i', $url) ) { ! $args = array( 'timeout' => $this->timeout, 'redirection' => $this->redirects); if ( !empty($this->headers) ) $args['headers'] = $this->headers; --- 66,76 ---- $this->method = SIMPLEPIE_FILE_SOURCE_REMOTE; if ( preg_match('/^http(s)?:\/\//i', $url) ) { ! $args = array( ! 'timeout' => $this->timeout, ! 'redirection' => $this->redirects, ! 'reject_unsafe_urls' => true, ! ); if ( !empty($this->headers) ) $args['headers'] = $this->headers; *************** *** 85,94 **** $this->status_code = wp_remote_retrieve_response_code( $res ); } } else { ! if ( ! file_exists($url) || ( ! $this->body = file_get_contents($url) ) ) { ! $this->error = 'file_get_contents could not read the file'; ! $this->success = false; ! } } } } --- 89,96 ---- $this->status_code = wp_remote_retrieve_response_code( $res ); } } else { ! $this->error = ''; ! $this->success = false; } } } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-http.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-http.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-http.php 2013-01-03 00:24:01.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-http.php 2013-06-21 14:32:36.000000000 -0500 *************** *** 86,92 **** 'timeout' => apply_filters( 'http_request_timeout', 5), 'redirection' => apply_filters( 'http_request_redirection_count', 5), 'httpversion' => apply_filters( 'http_request_version', '1.0'), ! 'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ), 'blocking' => true, 'headers' => array(), 'cookies' => array(), --- 86,93 ---- 'timeout' => apply_filters( 'http_request_timeout', 5), 'redirection' => apply_filters( 'http_request_redirection_count', 5), 'httpversion' => apply_filters( 'http_request_version', '1.0'), ! 'user-agent' => apply_filters( 'http_headers_useragent', 'WordPress/' . $wp_version . '; ' . get_bloginfo( 'url' ) ), ! 'reject_unsafe_urls' => apply_filters( 'http_request_reject_unsafe_urls', false ), 'blocking' => true, 'headers' => array(), 'cookies' => array(), *************** *** 108,122 **** $r = wp_parse_args( $args, $defaults ); $r = apply_filters( 'http_request_args', $r, $url ); ! // Certain classes decrement this, store a copy of the original value for loop purposes. ! $r['_redirection'] = $r['redirection']; // Allow plugins to short-circuit the request $pre = apply_filters( 'pre_http_request', false, $r, $url ); if ( false !== $pre ) return $pre; ! $arrURL = parse_url( $url ); if ( empty( $url ) || empty( $arrURL['scheme'] ) ) return new WP_Error('http_request_failed', __('A valid URL was not provided.')); --- 109,129 ---- $r = wp_parse_args( $args, $defaults ); $r = apply_filters( 'http_request_args', $r, $url ); ! // The transports decrement this, store a copy of the original value for loop purposes. ! if ( ! isset( $r['_redirection'] ) ) ! $r['_redirection'] = $r['redirection']; // Allow plugins to short-circuit the request $pre = apply_filters( 'pre_http_request', false, $r, $url ); if ( false !== $pre ) return $pre; ! if ( $r['reject_unsafe_urls'] ) ! $url = wp_http_validate_url( $url ); ! if ( function_exists( 'wp_kses_bad_protocol' ) ) ! $url = wp_kses_bad_protocol( $url, array( 'http', 'https', 'ssl' ) ); ! ! $arrURL = @parse_url( $url ); if ( empty( $url ) || empty( $arrURL['scheme'] ) ) return new WP_Error('http_request_failed', __('A valid URL was not provided.')); *************** *** 777,783 **** // If location is found, then assume redirect and redirect to location. if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) { if ( $r['redirection']-- > 0 ) { ! return $this->request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r); } else { return new WP_Error('http_request_failed', __('Too many redirects.')); } --- 784,790 ---- // If location is found, then assume redirect and redirect to location. if ( isset($arrHeaders['headers']['location']) && 0 !== $r['_redirection'] ) { if ( $r['redirection']-- > 0 ) { ! return wp_remote_request( WP_HTTP::make_absolute_url( $arrHeaders['headers']['location'], $url ), $r); } else { return new WP_Error('http_request_failed', __('Too many redirects.')); } *************** *** 887,893 **** array( 'method' => strtoupper($r['method']), 'user_agent' => $r['user-agent'], ! 'max_redirects' => $r['redirection'] + 1, // See #11557 'protocol_version' => (float) $r['httpversion'], 'header' => $strHeaders, 'ignore_errors' => true, // Return non-200 requests. --- 894,901 ---- array( 'method' => strtoupper($r['method']), 'user_agent' => $r['user-agent'], ! 'max_redirects' => 0, // Follow no redirects ! 'follow_redirects' => false, 'protocol_version' => (float) $r['httpversion'], 'header' => $strHeaders, 'ignore_errors' => true, // Return non-200 requests. *************** *** 960,969 **** else $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']); ! // Streams does not provide an error code which we can use to see why the request stream stopped. ! // We can however test to see if a location header is present and return based on that. ! if ( isset($processedHeaders['headers']['location']) && 0 !== $args['_redirection'] ) ! return new WP_Error('http_request_failed', __('Too many redirects.')); if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) $strResponse = WP_Http::chunkTransferDecode($strResponse); --- 968,980 ---- else $processedHeaders = WP_Http::processHeaders($meta['wrapper_data']); ! if ( ! empty( $processedHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections ! if ( $r['redirection']-- > 0 ) { ! return wp_remote_request( WP_HTTP::make_absolute_url( $processedHeaders['headers']['location'], $url ), $r ); ! } else { ! return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); ! } ! } if ( ! empty( $strResponse ) && isset( $processedHeaders['headers']['transfer-encoding'] ) && 'chunked' == $processedHeaders['headers']['transfer-encoding'] ) $strResponse = WP_Http::chunkTransferDecode($strResponse); *************** *** 1088,1093 **** --- 1099,1106 ---- // The option doesn't work with safe mode or when open_basedir is set, and there's a // bug #17490 with redirected POST requests, so handle redirections outside Curl. curl_setopt( $handle, CURLOPT_FOLLOWLOCATION, false ); + if ( defined( 'CURLOPT_PROTOCOLS' ) ) // PHP 5.2.10 / cURL 7.19.4 + curl_setopt( $handle, CURLOPT_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS ); switch ( $r['method'] ) { case 'HEAD': *************** *** 1178,1184 **** // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually. if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections if ( $r['redirection']-- > 0 ) { ! return $this->request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r ); } else { return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); } --- 1191,1197 ---- // See #11305 - When running under safe mode, redirection is disabled above. Handle it manually. if ( ! empty( $theHeaders['headers']['location'] ) && 0 !== $r['_redirection'] ) { // _redirection: The requested number of redirections if ( $r['redirection']-- > 0 ) { ! return wp_remote_request( WP_HTTP::make_absolute_url( $theHeaders['headers']['location'], $url ), $r ); } else { return new WP_Error( 'http_request_failed', __( 'Too many redirects.' ) ); } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-oembed.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-oembed.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-oembed.php 2012-12-10 16:50:34.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-oembed.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 108,114 **** $providers = array(); // Fetch URL content ! if ( $html = wp_remote_retrieve_body( wp_remote_get( $url ) ) ) { // types that contain oEmbed provider URLs $linktypes = apply_filters( 'oembed_linktypes', array( --- 108,114 ---- $providers = array(); // Fetch URL content ! if ( $html = wp_remote_retrieve_body( wp_remote_get( $url, array( 'reject_unsafe_urls' => true ) ) ) ) { // types that contain oEmbed provider URLs $linktypes = apply_filters( 'oembed_linktypes', array( *************** *** 190,196 **** */ function _fetch_with_format( $provider_url_with_args, $format ) { $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args ); ! $response = wp_remote_get( $provider_url_with_args ); if ( 501 == wp_remote_retrieve_response_code( $response ) ) return new WP_Error( 'not-implemented' ); if ( ! $body = wp_remote_retrieve_body( $response ) ) --- 190,196 ---- */ function _fetch_with_format( $provider_url_with_args, $format ) { $provider_url_with_args = add_query_arg( 'format', $format, $provider_url_with_args ); ! $response = wp_remote_get( $provider_url_with_args, array( 'reject_unsafe_urls' => true ) ); if ( 501 == wp_remote_retrieve_response_code( $response ) ) return new WP_Error( 'not-implemented' ); if ( ! $body = wp_remote_retrieve_body( $response ) ) *************** *** 219,253 **** if ( !function_exists('simplexml_load_string') ) { return false; } ! ! if ( ! class_exists( 'DOMDocument' ) ) return false; ! $errors = libxml_use_internal_errors( true ); ! $old_value = null; ! if ( function_exists( 'libxml_disable_entity_loader' ) ) { ! $old_value = libxml_disable_entity_loader( true ); ! } ! ! $dom = new DOMDocument; ! $success = $dom->loadXML( $response_body ); ! if ( ! is_null( $old_value ) ) { ! libxml_disable_entity_loader( $old_value ); ! } libxml_use_internal_errors( $errors ); ! if ( ! $success || isset( $dom->doctype ) ) { ! return false; } ! $data = simplexml_import_dom( $dom ); ! if ( ! is_object( $data ) ) ! return false; ! ! $return = new stdClass; ! foreach ( $data as $key => $value ) ! $return->$key = (string) $value; return $return; } --- 219,242 ---- if ( !function_exists('simplexml_load_string') ) { return false; } ! if ( ! function_exists( 'libxml_disable_entity_loader' ) ) return false; ! $loader = libxml_disable_entity_loader( true ); ! $errors = libxml_use_internal_errors( true ); ! $data = simplexml_load_string( $response_body ); libxml_use_internal_errors( $errors ); ! $return = false; ! if ( is_object( $data ) ) { ! $return = new stdClass; ! foreach ( $data as $key => $value ) { ! $return->$key = (string) $value; ! } } ! libxml_disable_entity_loader( $loader ); return $return; } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-phpass.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-phpass.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-phpass.php 2011-09-03 11:02:41.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-phpass.php 2013-06-20 20:26:34.000000000 -0500 *************** *** 253,259 **** if ($hash[0] == '*') $hash = crypt($password, $stored_hash); ! return $hash == $stored_hash; } } --- 253,259 ---- if ($hash[0] == '*') $hash = crypt($password, $stored_hash); ! return $hash === $stored_hash; } } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-wp-admin-bar.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-wp-admin-bar.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/class-wp-admin-bar.php 2012-11-20 15:14:49.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/class-wp-admin-bar.php 2013-06-19 03:16:09.000000000 -0500 *************** *** 354,360 **** --- 354,362 ---- $this->_render_group( $group ); } ?> + + 10, 'redirection' => 0 ) ) ); if ( !$linea ) return $this->pingback_error( 16, __( 'The source URL does not exist.' ) ); --- 5380,5387 ---- sleep(1); // Let's check the remote site ! $linea = wp_remote_retrieve_body( wp_remote_get( $pagelinkedfrom, array( 'timeout' => 10, 'redirection' => 0, 'reject_unsafe_urls' => true ) ) ); ! if ( !$linea ) return $this->pingback_error( 16, __( 'The source URL does not exist.' ) ); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/comment.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/comment.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/comment.php 2013-01-22 16:38:46.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/comment.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 1661,1667 **** if ( 0 === strpos($url, $uploads_dir['baseurl']) ) return false; ! $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) ); if ( is_wp_error( $response ) ) return false; --- 1661,1667 ---- if ( 0 === strpos($url, $uploads_dir['baseurl']) ) return false; ! $response = wp_remote_head( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) return false; *************** *** 1674,1680 **** return false; // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file) ! $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0' ) ); if ( is_wp_error( $response ) ) return false; --- 1674,1680 ---- return false; // Now do a GET since we're going to look in the html headers (and we're sure its not a binary file) ! $response = wp_remote_get( $url, array( 'timeout' => 2, 'httpversion' => '1.0', 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) return false; *************** *** 1908,1913 **** --- 1908,1914 ---- $options = array(); $options['timeout'] = 4; + $options['reject_unsafe_urls'] = true; $options['body'] = array( 'title' => $title, 'url' => get_permalink($ID), *************** *** 1955,2016 **** * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI * * @since 3.5.1 * * @param string $source_uri * @return string */ function pingback_ping_source_uri( $source_uri ) { ! $uri = esc_url_raw( $source_uri, array( 'http', 'https' ) ); ! if ( ! $uri ) ! return ''; ! ! $parsed_url = @parse_url( $uri ); ! if ( ! $parsed_url ) ! return ''; ! ! if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) ! return ''; ! ! if ( false !== strpos( $parsed_url['host'], ':' ) ) ! return ''; ! ! $parsed_home = @parse_url( get_option( 'home' ) ); ! ! $same_host = strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ); ! ! if ( ! $same_host ) { ! $host = trim( $parsed_url['host'], '.' ); ! if ( preg_match( '#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host ) ) { ! $ip = $host; ! } else { ! $ip = gethostbyname( $host ); ! if ( $ip === $host ) // Error condition for gethostbyname() ! $ip = false; ! } ! if ( $ip ) { ! if ( '127.0.0.1' === $ip ) ! return ''; ! $parts = array_map( 'intval', explode( '.', $ip ) ); ! if ( 10 === $parts[0] ) ! return ''; ! if ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] ) ! return ''; ! if ( 192 === $parts[0] && 168 === $parts[1] ) ! return ''; ! } ! } ! ! if ( empty( $parsed_url['port'] ) ) ! return $uri; ! ! $port = $parsed_url['port']; ! if ( 80 === $port || 443 === $port || 8080 === $port ) ! return $uri; ! ! if ( $parsed_home && $same_host && $parsed_home['port'] === $port ) ! return $uri; ! ! return ''; } /** --- 1956,1968 ---- * Default filter attached to pingback_ping_source_uri to validate the pingback's Source URI * * @since 3.5.1 + * @see wp_http_validate_url() * * @param string $source_uri * @return string */ function pingback_ping_source_uri( $source_uri ) { ! return (string) wp_http_validate_url( $source_uri ); } /** diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/deprecated.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/deprecated.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/deprecated.php 2012-11-22 03:52:16.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/deprecated.php 2013-06-19 03:00:13.000000000 -0500 *************** *** 3298,3304 **** */ function wp_get_single_post( $postid = 0, $mode = OBJECT ) { _deprecated_function( __FUNCTION__, '3.5', 'get_post()' ); ! return get_post( $postid, $mode, 'edit' ); } /** --- 3298,3304 ---- */ function wp_get_single_post( $postid = 0, $mode = OBJECT ) { _deprecated_function( __FUNCTION__, '3.5', 'get_post()' ); ! return get_post( $postid, $mode ); } /** diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/formatting.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/formatting.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/formatting.php 2012-11-18 19:28:32.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/formatting.php 2013-06-19 17:12:36.000000000 -0500 *************** *** 2601,2610 **** if ( ! is_array( $protocols ) ) $protocols = wp_allowed_protocols(); ! if ( wp_kses_bad_protocol( $url, $protocols ) != $url ) return ''; ! return apply_filters('clean_url', $url, $original_url, $_context); } /** --- 2601,2611 ---- if ( ! is_array( $protocols ) ) $protocols = wp_allowed_protocols(); ! $good_protocol_url = wp_kses_bad_protocol( $url, $protocols ); ! if ( strtolower( $good_protocol_url ) != strtolower( $url ) ) return ''; ! return apply_filters('clean_url', $good_protocol_url, $original_url, $_context); } /** *************** *** 2869,2875 **** case 'illegal_names': if ( ! is_array( $value ) ) ! $value = explode( "\n", $value ); $value = array_values( array_filter( array_map( 'trim', $value ) ) ); --- 2870,2876 ---- case 'illegal_names': if ( ! is_array( $value ) ) ! $value = explode( ' ', $value ); $value = array_values( array_filter( array_map( 'trim', $value ) ) ); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/functions.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/functions.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/functions.php 2013-01-04 16:52:10.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/functions.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 496,501 **** --- 496,502 ---- $options = array(); $options['redirection'] = 5; + $options['reject_unsafe_urls'] = true; if ( false == $file_path ) $options['method'] = 'HEAD'; *************** *** 543,549 **** if ( !empty( $deprecated ) ) _deprecated_argument( __FUNCTION__, '2.7' ); ! $response = wp_remote_head( $url ); if ( is_wp_error( $response ) ) return false; --- 544,550 ---- if ( !empty( $deprecated ) ) _deprecated_argument( __FUNCTION__, '2.7' ); ! $response = wp_remote_head( $url, array( 'reject_unsafe_urls' => true ) ); if ( is_wp_error( $response ) ) return false; *************** *** 655,664 **** else $frag = ''; ! if ( 0 === stripos( 'http://', $uri ) ) { $protocol = 'http://'; $uri = substr( $uri, 7 ); ! } elseif ( 0 === stripos( 'https://', $uri ) ) { $protocol = 'https://'; $uri = substr( $uri, 8 ); } else { --- 656,665 ---- else $frag = ''; ! if ( 0 === stripos( $uri, 'http://' ) ) { $protocol = 'http://'; $uri = substr( $uri, 7 ); ! } elseif ( 0 === stripos( $uri, 'https://' ) ) { $protocol = 'https://'; $uri = substr( $uri, 8 ); } else { *************** *** 758,763 **** --- 759,765 ---- $options = array(); $options['timeout'] = 10; + $options['reject_unsafe_urls'] = true; $response = wp_remote_get( $uri, $options ); *************** *** 2954,2962 **** // Allow plugin to filter the output error trigger if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) { ! $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version ); ! $message .= ' ' . __( 'Please see Debugging in WordPress for more information.' ); ! trigger_error( sprintf( __( '%1$s was called incorrectly. %2$s %3$s' ), $function, $message, $version ) ); } } --- 2956,2970 ---- // Allow plugin to filter the output error trigger if ( WP_DEBUG && apply_filters( 'doing_it_wrong_trigger_error', true ) ) { ! if ( function_exists( '__' ) ) { ! $version = is_null( $version ) ? '' : sprintf( __( '(This message was added in version %s.)' ), $version ); ! $message .= ' ' . __( 'Please see Debugging in WordPress for more information.' ); ! trigger_error( sprintf( __( '%1$s was called incorrectly. %2$s %3$s' ), $function, $message, $version ) ); ! } else { ! $version = is_null( $version ) ? '' : sprintf( '(This message was added in version %s.)', $version ); ! $message .= ' Please see Debugging in WordPress for more information.'; ! trigger_error( sprintf( '%1$s was called incorrectly. %2$s %3$s', $function, $message, $version ) ); ! } } } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/http.php /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/http.php *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/http.php 2012-09-24 16:39:04.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/http.php 2013-06-21 01:12:17.000000000 -0500 *************** *** 311,313 **** --- 311,374 ---- return false; } + + /** + * Validate a URL for safe use in the HTTP API. + * + * @since 3.5.2 + * + * @return mixed URL or false on failure. + */ + function wp_http_validate_url( $url ) { + $url = esc_url_raw( $url, array( 'http', 'https' ) ); + if ( ! $url ) + return false; + + $parsed_url = @parse_url( $url ); + if ( ! $parsed_url ) + return false; + + if ( isset( $parsed_url['user'] ) || isset( $parsed_url['pass'] ) ) + return false; + + if ( false !== strpos( $parsed_url['host'], ':' ) ) + return false; + + $parsed_home = @parse_url( get_option( 'home' ) ); + + $same_host = strtolower( $parsed_home['host'] ) === strtolower( $parsed_url['host'] ); + + if ( ! $same_host ) { + $host = trim( $parsed_url['host'], '.' ); + if ( preg_match( '#^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$#', $host ) ) { + $ip = $host; + } else { + $ip = gethostbyname( $host ); + if ( $ip === $host ) // Error condition for gethostbyname() + $ip = false; + } + if ( $ip ) { + if ( '127.0.0.1' === $ip ) + return false; + $parts = array_map( 'intval', explode( '.', $ip ) ); + if ( 10 === $parts[0] ) + return false; + if ( 172 === $parts[0] && 16 <= $parts[1] && 31 >= $parts[1] ) + return false; + if ( 192 === $parts[0] && 168 === $parts[1] ) + return false; + } + } + + if ( empty( $parsed_url['port'] ) ) + return $url; + + $port = $parsed_url['port']; + if ( 80 === $port || 443 === $port || 8080 === $port ) + return $url; + + if ( $parsed_home && $same_host && $parsed_home['port'] === $port ) + return $url; + + return false; + } diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/media-editor.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/media-editor.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/media-editor.js 2013-01-14 11:37:00.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/media-editor.js 2013-05-02 17:08:33.000000000 -0500 *************** *** 170,175 **** --- 170,176 ---- icontag: 'dt', captiontag: 'dd', columns: '3', + link: 'post', size: 'thumbnail', orderby: 'menu_order ID' }, diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/media-editor.min.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/media-editor.min.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/media-editor.min.js 2013-01-17 18:07:39.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/media-editor.min.js 2013-06-21 02:20:58.000000000 -0500 *************** *** 1 **** ! (function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if("image"===k.type&&!k.alt){k.alt=k.caption||k.title||"";k.alt=k.alt.replace(/<\/?[^>]+>/g,"");k.alt=k.alt.replace(/[\r\n]+/g," ")}return k};f=f?_.clone(f):{};if(i&&i.type){f.type=i.type}if("image"===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting("align","none"),size:j.size||getUserSetting("imgsize","medium"),url:"",classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting("urlbutton","file");if("file"===h){c=i.url}else{if("post"===h){c=i.link}else{if("custom"===h){c=f.linkUrl}}}f.linkUrl=c||"";if("image"===i.type){f.classes.push("wp-image-"+i.id);g=i.sizes;e=g&&g[f.size]?g[f.size]:i;_.extend(f,_.pick(i,"align","caption","alt"),{width:e.width,height:e.height,src:e.url,captionId:"attachment_"+i.id})}else{f.title=f.title||i.filename;f.rel=f.rel||"attachment wp-att-"+i.id}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:"a",content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=g.url;_.extend(c,_.pick(g,"width","height","alt"));if(g.align&&!g.caption){f.push("align"+g.align)}if(g.size){f.push("size-"+g.size)}c["class"]=_.compact(f).join(" ");d={tag:"img",attrs:c,single:true};if(g.linkUrl){d={tag:"a",attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align="align"+g.align}e=wp.shortcode.string({tag:"caption",attrs:h,content:e+" "+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:"ASC",id:wp.media.view.settings.post.id,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",size:"thumbnail",orderby:"menu_order ID"},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,"orderby","order");e.type="image";e.perPage=-1;if("rand"===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby="menuOrder"}if(f.ids){e.post__in=f.ids.split(",");e.orderby="post__in"}else{if(f.include){e.post__in=f.include.split(",")}}if(f.exclude){e.post__not_in=f.exclude.split(",")}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,"id","ids","include","exclude","orderby","order");i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,"orderby","order"),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck("id");if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby="rand"}delete e._orderbyRandom;if(e.ids&&"post__in"===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:"gallery",attrs:e,type:"single"});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next("gallery",g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get("id"))&&!_.isUndefined(h)){f.set("id",h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset("orderby")});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post("set-post-thumbnail",{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(".inside","#postimagediv").html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage()]});this._frame.on("toolbar:create:featured-image",function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state("featured-image").on("select",this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get("selection").single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b("#postimagediv").on("click","#set-post-thumbnail",function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!="undefined",j=typeof(QTags)!="undefined",c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&&tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&&!f.isHidden()){if(tinymce.isIE&&f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf("[caption")!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf("[gallery")!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf("[embed")===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand("mceInsertContent",false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true}));d.on("insert",function(f){var g=d.state();f=f||g.get("selection");if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join("\n\n"))})},this);d.state("gallery-edit").on("update",function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state("embed").on("select",function(){var g=d.state(),f=g.get("type"),h=g.props.toJSON();h.url=h.url||"";if("link"===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if("image"===f){_.defaults(h,{title:h.url,linkUrl:"",align:"none",link:"none"});if("none"===h.link){h.linkUrl=""}else{if("file"===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state("featured-image").on("select",wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&&typeof tinymce!=="undefined"&&tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||"";return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if("image"===g.type){e=wp.media.string.image(f);_.each({align:"align",size:"image-size",alt:"image_alt"},function(h,i){if(f[i]){d[h]=f[i]}})}else{e=wp.media.string.link(f);d.post_title=f.title}return wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!=="undefined"){c=tinymce.get(e);if(tinymce.isIE&&c&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on("click",".insert-media",function(d){var e=b(this),c=e.data("editor");d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,"open");b(wp.media.editor.init)}(jQuery)); \ No newline at end of file --- 1 ---- ! (function(b){var a={};wp.media.string={props:function(f,i){var h,c,e,g,d,j=wp.media.view.settings.defaultProps;d=function(k){if("image"===k.type&&!k.alt){k.alt=k.caption||k.title||"";k.alt=k.alt.replace(/<\/?[^>]+>/g,"");k.alt=k.alt.replace(/[\r\n]+/g," ")}return k};f=f?_.clone(f):{};if(i&&i.type){f.type=i.type}if("image"===f.type){f=_.defaults(f||{},{align:j.align||getUserSetting("align","none"),size:j.size||getUserSetting("imgsize","medium"),url:"",classes:[]})}if(!i){return d(f)}f.title=f.title||i.title;h=f.link||j.link||getUserSetting("urlbutton","file");if("file"===h){c=i.url}else{if("post"===h){c=i.link}else{if("custom"===h){c=f.linkUrl}}}f.linkUrl=c||"";if("image"===i.type){f.classes.push("wp-image-"+i.id);g=i.sizes;e=g&&g[f.size]?g[f.size]:i;_.extend(f,_.pick(i,"align","caption","alt"),{width:e.width,height:e.height,src:e.url,captionId:"attachment_"+i.id})}else{f.title=f.title||i.filename;f.rel=f.rel||"attachment wp-att-"+i.id}return d(f)},link:function(d,e){var c;d=wp.media.string.props(d,e);c={tag:"a",content:d.title,attrs:{href:d.linkUrl}};if(d.rel){c.attrs.rel=d.rel}return wp.html.string(c)},image:function(g,i){var c={},d,f,h,e;g=wp.media.string.props(g,i);f=g.classes||[];c.src=g.url;_.extend(c,_.pick(g,"width","height","alt"));if(g.align&&!g.caption){f.push("align"+g.align)}if(g.size){f.push("size-"+g.size)}c["class"]=_.compact(f).join(" ");d={tag:"img",attrs:c,single:true};if(g.linkUrl){d={tag:"a",attrs:{href:g.linkUrl},content:d}}e=wp.html.string(d);if(g.caption){h={};if(c.width){h.width=c.width}if(g.captionId){h.id=g.captionId}if(g.align){h.align="align"+g.align}e=wp.shortcode.string({tag:"caption",attrs:h,content:e+" "+g.caption})}return e}};wp.media.gallery=(function(){var c={};return{defaults:{order:"ASC",id:wp.media.view.settings.post.id,itemtag:"dl",icontag:"dt",captiontag:"dd",columns:"3",link:"post",size:"thumbnail",orderby:"menu_order ID"},attachments:function(h){var j=h.string(),d=c[j],f,e,i,g;delete c[j];if(d){return d}f=_.defaults(h.attrs.named,wp.media.gallery.defaults);e=_.pick(f,"orderby","order");e.type="image";e.perPage=-1;if("rand"===f.orderby){f._orderbyRandom=true}if(!f.orderby||/^menu_order(?: ID)?$/i.test(f.orderby)){e.orderby="menuOrder"}if(f.ids){e.post__in=f.ids.split(",");e.orderby="post__in"}else{if(f.include){e.post__in=f.include.split(",")}}if(f.exclude){e.post__not_in=f.exclude.split(",")}if(!e.post__in){e.uploadedTo=f.id}g=_.omit(f,"id","ids","include","exclude","orderby","order");i=wp.media.query(e);i.gallery=new Backbone.Model(g);return i},shortcode:function(d){var f=d.props.toJSON(),e=_.pick(f,"orderby","order"),g,h;if(d.gallery){_.extend(e,d.gallery.toJSON())}e.ids=d.pluck("id");if(f.uploadedTo){e.id=f.uploadedTo}if(e._orderbyRandom){e.orderby="rand"}delete e._orderbyRandom;if(e.ids&&"post__in"===e.orderby){delete e.orderby}_.each(wp.media.gallery.defaults,function(j,i){if(j===e[i]){delete e[i]}});g=new wp.shortcode({tag:"gallery",attrs:e,type:"single"});h=new wp.media.model.Attachments(d.models,{props:f});h.gallery=d.gallery;c[g.string()]=h;return g},edit:function(g){var f=wp.shortcode.next("gallery",g),h=wp.media.gallery.defaults.id,d,e;if(!f||f.content!==g){return}f=f.shortcode;if(_.isUndefined(f.get("id"))&&!_.isUndefined(h)){f.set("id",h)}d=wp.media.gallery.attachments(f);e=new wp.media.model.Selection(d.models,{props:d.props.toJSON(),multiple:true});e.gallery=d.gallery;e.more().done(function(){e.props.set({query:false});e.unmirror();e.props.unset("orderby")});if(this.frame){this.frame.dispose()}this.frame=wp.media({frame:"post",state:"gallery-edit",title:wp.media.view.l10n.editGalleryTitle,editing:true,multiple:true,selection:e}).open();return this.frame}}}());wp.media.featuredImage={get:function(){return wp.media.view.settings.post.featuredImageId},set:function(d){var c=wp.media.view.settings;c.post.featuredImageId=d;wp.media.post("set-post-thumbnail",{json:true,post_id:c.post.id,thumbnail_id:c.post.featuredImageId,_wpnonce:c.post.nonce}).done(function(e){b(".inside","#postimagediv").html(e)})},frame:function(){if(this._frame){return this._frame}this._frame=wp.media({state:"featured-image",states:[new wp.media.controller.FeaturedImage()]});this._frame.on("toolbar:create:featured-image",function(c){this.createSelectToolbar(c,{text:wp.media.view.l10n.setFeaturedImage})},this._frame);this._frame.state("featured-image").on("select",this.select);return this._frame},select:function(){var d=wp.media.view.settings,c=this.get("selection").single();if(!d.post.featuredImageId){return}wp.media.featuredImage.set(c?c.id:-1)},init:function(){b("#postimagediv").on("click","#set-post-thumbnail",function(c){c.preventDefault();c.stopPropagation();wp.media.featuredImage.frame().open()}).on("click","#remove-post-thumbnail",function(){wp.media.view.settings.post.featuredImageId=-1})}};b(wp.media.featuredImage.init);wp.media.editor={insert:function(g){var d=typeof(tinymce)!="undefined",j=typeof(QTags)!="undefined",c=window.wpActiveEditor,f;if(window.send_to_editor){return window.send_to_editor.apply(this,arguments)}if(!c){if(d&&tinymce.activeEditor){f=tinymce.activeEditor;c=window.wpActiveEditor=f.id}else{if(!j){return false}}}else{if(d){if(tinymce.activeEditor&&(tinymce.activeEditor.id=="mce_fullscreen"||tinymce.activeEditor.id=="wp_mce_fullscreen")){f=tinymce.activeEditor}else{f=tinymce.get(c)}}}if(f&&!f.isHidden()){if(tinymce.isIE&&f.windowManager.insertimagebookmark){f.selection.moveToBookmark(f.windowManager.insertimagebookmark)}if(g.indexOf("[caption")!==-1){if(f.wpSetImgCaption){g=f.wpSetImgCaption(g)}}else{if(g.indexOf("[gallery")!==-1){if(f.plugins.wpgallery){g=f.plugins.wpgallery._do_gallery(g)}}else{if(g.indexOf("[embed")===0){if(f.plugins.wordpress){g=f.plugins.wordpress._setEmbed(g)}}}}f.execCommand("mceInsertContent",false,g)}else{if(j){QTags.insertContent(g)}else{document.getElementById(c).value+=g}}if(window.tb_remove){try{window.tb_remove()}catch(i){}}},add:function(e,c){var d=this.get(e);if(d){return d}d=a[e]=wp.media(_.defaults(c||{},{frame:"post",state:"insert",title:wp.media.view.l10n.addMedia,multiple:true}));d.on("insert",function(f){var g=d.state();f=f||g.get("selection");if(!f){return}b.when.apply(b,f.map(function(i){var h=g.display(i).toJSON();return this.send.attachment(h,i.toJSON())},this)).done(function(){wp.media.editor.insert(_.toArray(arguments).join("\n\n"))})},this);d.state("gallery-edit").on("update",function(f){this.insert(wp.media.gallery.shortcode(f).string())},this);d.state("embed").on("select",function(){var g=d.state(),f=g.get("type"),h=g.props.toJSON();h.url=h.url||"";if("link"===f){_.defaults(h,{title:h.url,linkUrl:h.url});this.send.link(h).done(function(i){wp.media.editor.insert(i)})}else{if("image"===f){_.defaults(h,{title:h.url,linkUrl:"",align:"none",link:"none"});if("none"===h.link){h.linkUrl=""}else{if("file"===h.link){h.linkUrl=h.url}}this.insert(wp.media.string.image(h))}}},this);d.state("featured-image").on("select",wp.media.featuredImage.select);d.setState(d.options.state);return d},id:function(c){if(c){return c}c=wpActiveEditor;if(!c&&typeof tinymce!=="undefined"&&tinymce.activeEditor){c=tinymce.activeEditor.id}c=c||"";return c},get:function(c){c=this.id(c);return a[c]},remove:function(c){c=this.id(c);delete a[c]},send:{attachment:function(f,g){var c=g.caption,d,e;if(!wp.media.view.settings.captions){delete g.caption}f=wp.media.string.props(f,g);d={id:g.id,post_content:g.description,post_excerpt:c};if(f.linkUrl){d.url=f.linkUrl}if("image"===g.type){e=wp.media.string.image(f);_.each({align:"align",size:"image-size",alt:"image_alt"},function(h,i){if(f[i]){d[h]=f[i]}})}else{e=wp.media.string.link(f);d.post_title=f.title}return wp.media.post("send-attachment-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,attachment:d,html:e,post_id:wp.media.view.settings.post.id})},link:function(c){return wp.media.post("send-link-to-editor",{nonce:wp.media.view.settings.nonce.sendToEditor,src:c.linkUrl,title:c.title,html:wp.media.string.link(c),post_id:wp.media.view.settings.post.id})}},open:function(e){var d,c;e=this.id(e);if(typeof tinymce!=="undefined"){c=tinymce.get(e);if(tinymce.isIE&&c&&!c.isHidden()){c.focus();c.windowManager.insertimagebookmark=c.selection.getBookmark()}}d=this.get(e);if(!d){d=this.add(e)}return d.open()},init:function(){b(document.body).on("click",".insert-media",function(d){var e=b(this),c=e.data("editor");d.preventDefault();e.blur();wp.media.editor.open(c)})}};_.bindAll(wp.media.editor,"open");b(wp.media.editor.init)}(jQuery)); \ No newline at end of file diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/plupload/handlers.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/plupload/handlers.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/plupload/handlers.js 2012-11-21 07:05:44.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/plupload/handlers.js 2013-06-20 22:46:51.000000000 -0500 *************** *** 16,22 **** items.removeClass('open').find('.slidetoggle').slideUp(200); } // Create a progress bar containing the filename ! jQuery('#media-items').append('
0%
' + fileObj.name + '
'); // Disable submit jQuery('#insert-gallery').prop('disabled', true); --- 16,27 ---- items.removeClass('open').find('.slidetoggle').slideUp(200); } // Create a progress bar containing the filename ! jQuery('
') ! .attr( 'id', 'media-item-' + fileObj.id ) ! .addClass('child-of-' + postid) ! .append('
0%
', ! jQuery('
').text( ' ' + fileObj.name )) ! .appendTo( jQuery('#media-items' ) ); // Disable submit jQuery('#insert-gallery').prop('disabled', true); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/plupload/handlers.min.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/plupload/handlers.min.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/plupload/handlers.min.js 2012-11-21 08:58:31.000000000 -0600 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/plupload/handlers.min.js 2013-06-21 02:20:58.000000000 -0500 *************** *** 1 **** ! var topWin=window.dialogArguments||opener||parent||top,uploader,uploader_init;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(b){jQuery(".media-blank").remove();var a=jQuery("#media-items").children(),c=post_id||0;if(a.length==1){a.removeClass("open").find(".slidetoggle").slideUp(200)}jQuery("#media-items").append('
0%
'+b.name+"
");jQuery("#insert-gallery").prop("disabled",true)}function uploadStart(){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(a){}return true}function uploadProgress(a,b){var c=jQuery("#media-item-"+b.id);jQuery(".bar",c).width((200*b.loaded)/b.size);jQuery(".percent",c).html(b.percent+"%")}function fileUploading(c,d){var b=100*1024*1024,a=parseInt(c.settings.max_file_size,10);if(a>b&&d.size>b){setTimeout(function(){var e;if(d.status<3&&d.loaded==0){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""));c.stop();c.removeFile(d);c.start()}},10000)}}function updateMediaForm(){var a=jQuery("#media-items").children();if(a.length==1){a.addClass("open").find(".slidetoggle").show();jQuery(".insert-gallery").hide()}else{if(a.length>1){a.removeClass("open");jQuery(".insert-gallery").show()}}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}}function uploadSuccess(c,a){var b=jQuery("#media-item-"+c.id);a=a.replace(/^
(\d+)<\/pre>$/,"$1");if(a.match(/media-upload-error|error-div/)){b.html(a);return}else{jQuery(".percent",b).html(pluploadL10n.crunching)}prepareMediaItem(c,a);updateMediaForm();if(post_id&&b.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function setResize(a){if(a){if(uploader.features.jpgresize){uploader.settings.resize={width:resize_width,height:resize_height,quality:100}}else{uploader.settings.multipart_params.image_resize=true}}else{delete (uploader.settings.resize);delete (uploader.settings.multipart_params.image_resize)}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);if(d==2&&shortform>2){d=shortform}try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(post_id&&c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery(".menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").addClass("open").find("slidetoggle").fadeIn()}function wpQueueError(a){jQuery("#media-upload-error").show().html('

'+a+"

")}function wpFileError(b,a){itemAjaxError(b.id,a)}function itemAjaxError(e,c){var b=jQuery("#media-item-"+e),a=b.find(".filename").text(),d=b.data("last-err");if(d==e){return}b.html('
'+pluploadL10n.dismiss+""+pluploadL10n.error_uploading.replace("%s",jQuery.trim(a))+" "+c+"
").data("last-err",e)}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(post_id&&a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+pluploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function uploadComplete(){jQuery("#insert-gallery").prop("disabled",false)}function switchUploader(a){if(a){deleteUserSetting("uploader");jQuery(".media-upload-form").removeClass("html-uploader");if(typeof(uploader)=="object"){uploader.refresh()}}else{setUserSetting("uploader","1");jQuery(".media-upload-form").addClass("html-uploader")}}function dndHelper(a){var b=document.getElementById("dnd-helper");if(a){b.style.display="block"}else{b.style.display="none"}}function uploadError(d,f,c,e){var b=100*1024*1024,a;switch(f){case plupload.FAILED:wpFileError(d,pluploadL10n.upload_failed);break;case plupload.FILE_EXTENSION_ERROR:wpFileError(d,pluploadL10n.invalid_filetype);break;case plupload.FILE_SIZE_ERROR:uploadSizeError(e,d);break;case plupload.IMAGE_FORMAT_ERROR:wpFileError(d,pluploadL10n.not_an_image);break;case plupload.IMAGE_MEMORY_ERROR:wpFileError(d,pluploadL10n.image_memory_exceeded);break;case plupload.IMAGE_DIMENSIONS_ERROR:wpFileError(d,pluploadL10n.image_dimensions_exceeded);break;case plupload.GENERIC_ERROR:wpQueueError(pluploadL10n.upload_failed);break;case plupload.IO_ERROR:a=parseInt(e.settings.max_file_size,10);if(a>b&&d.size>b){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""))}else{wpQueueError(pluploadL10n.io_error)}break;case plupload.HTTP_ERROR:wpQueueError(pluploadL10n.http_error);break;case plupload.INIT_ERROR:jQuery(".media-upload-form").addClass("html-uploader");break;case plupload.SECURITY_ERROR:wpQueueError(pluploadL10n.security_error);break;default:wpFileError(d,pluploadL10n.default_error)}}function uploadSizeError(a,b,d){var c;if(d){c=pluploadL10n.big_upload_queued.replace("%s",b.name)+" "+pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s","")}else{c=pluploadL10n.file_exceeds_size_limit.replace("%s",b.name)}jQuery("#media-items").append('

'+c+"

");a.removeFile(b)}jQuery(document).ready(function(a){a(".media-upload-form").bind("click.uploader",function(f){var d=a(f.target),b,g;if(d.is('input[type="radio"]')){b=d.closest("tr");if(b.hasClass("align")){setUserSetting("align",d.val())}else{if(b.hasClass("image-size")){setUserSetting("imgsize",d.val())}}}else{if(d.is("button.button")){g=f.target.className||"";g=g.match(/url([^ '"]+)/);if(g&&g[1]){setUserSetting("urlbutton",g[1]);d.siblings(".urlfield").val(d.data("link-url"))}}else{if(d.is("a.dismiss")){d.parents(".media-item").fadeOut(200,function(){a(this).remove()})}else{if(d.is(".upload-flash-bypass a")||d.is("a.uploader-html")){a("#media-items, p.submit, span.big-file-warning").css("display","none");switchUploader(0);f.preventDefault()}else{if(d.is(".upload-html-bypass a")){a("#media-items, p.submit, span.big-file-warning").css("display","");switchUploader(1);f.preventDefault()}else{if(d.is("a.describe-toggle-on")){d.parent().addClass("open");d.siblings(".slidetoggle").fadeIn(250,function(){var i=a(window).scrollTop(),e=a(window).height(),k=a(this).offset().top,j=a(this).height(),c,l;if(e&&k&&j){c=k+j;l=i+e;if(c>l){if(c-lc&&f.size>c&&d.runtime!="html5"){uploadSizeError(d,f,true)}else{fileQueued(f)}});d.refresh();d.start()});uploader.bind("BeforeUpload",function(b,c){});uploader.bind("UploadFile",function(b,c){fileUploading(b,c)});uploader.bind("UploadProgress",function(b,c){uploadProgress(b,c)});uploader.bind("Error",function(b,c){uploadError(c.file,c.code,c.message,b);b.refresh()});uploader.bind("FileUploaded",function(b,d,c){uploadSuccess(d,c.response)});uploader.bind("UploadComplete",function(b,c){uploadComplete()})};if(typeof(wpUploaderInit)=="object"){uploader_init()}}); \ No newline at end of file --- 1 ---- ! var topWin=window.dialogArguments||opener||parent||top,uploader,uploader_init;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(b){jQuery(".media-blank").remove();var a=jQuery("#media-items").children(),c=post_id||0;if(a.length==1){a.removeClass("open").find(".slidetoggle").slideUp(200)}jQuery('
').attr("id","media-item-"+b.id).addClass("child-of-"+c).append('
0%
',jQuery('
').text(" "+b.name)).appendTo(jQuery("#media-items"));jQuery("#insert-gallery").prop("disabled",true)}function uploadStart(){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(a){}return true}function uploadProgress(a,b){var c=jQuery("#media-item-"+b.id);jQuery(".bar",c).width((200*b.loaded)/b.size);jQuery(".percent",c).html(b.percent+"%")}function fileUploading(c,d){var b=100*1024*1024,a=parseInt(c.settings.max_file_size,10);if(a>b&&d.size>b){setTimeout(function(){var e;if(d.status<3&&d.loaded==0){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""));c.stop();c.removeFile(d);c.start()}},10000)}}function updateMediaForm(){var a=jQuery("#media-items").children();if(a.length==1){a.addClass("open").find(".slidetoggle").show();jQuery(".insert-gallery").hide()}else{if(a.length>1){a.removeClass("open");jQuery(".insert-gallery").show()}}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}}function uploadSuccess(c,a){var b=jQuery("#media-item-"+c.id);a=a.replace(/^
(\d+)<\/pre>$/,"$1");if(a.match(/media-upload-error|error-div/)){b.html(a);return}else{jQuery(".percent",b).html(pluploadL10n.crunching)}prepareMediaItem(c,a);updateMediaForm();if(post_id&&b.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function setResize(a){if(a){if(uploader.features.jpgresize){uploader.settings.resize={width:resize_width,height:resize_height,quality:100}}else{uploader.settings.multipart_params.image_resize=true}}else{delete (uploader.settings.resize);delete (uploader.settings.multipart_params.image_resize)}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);if(d==2&&shortform>2){d=shortform}try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(post_id&&c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery(".menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").addClass("open").find("slidetoggle").fadeIn()}function wpQueueError(a){jQuery("#media-upload-error").show().html('

'+a+"

")}function wpFileError(b,a){itemAjaxError(b.id,a)}function itemAjaxError(e,c){var b=jQuery("#media-item-"+e),a=b.find(".filename").text(),d=b.data("last-err");if(d==e){return}b.html('
'+pluploadL10n.dismiss+""+pluploadL10n.error_uploading.replace("%s",jQuery.trim(a))+" "+c+"
").data("last-err",e)}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(post_id&&a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+pluploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function uploadComplete(){jQuery("#insert-gallery").prop("disabled",false)}function switchUploader(a){if(a){deleteUserSetting("uploader");jQuery(".media-upload-form").removeClass("html-uploader");if(typeof(uploader)=="object"){uploader.refresh()}}else{setUserSetting("uploader","1");jQuery(".media-upload-form").addClass("html-uploader")}}function dndHelper(a){var b=document.getElementById("dnd-helper");if(a){b.style.display="block"}else{b.style.display="none"}}function uploadError(d,f,c,e){var b=100*1024*1024,a;switch(f){case plupload.FAILED:wpFileError(d,pluploadL10n.upload_failed);break;case plupload.FILE_EXTENSION_ERROR:wpFileError(d,pluploadL10n.invalid_filetype);break;case plupload.FILE_SIZE_ERROR:uploadSizeError(e,d);break;case plupload.IMAGE_FORMAT_ERROR:wpFileError(d,pluploadL10n.not_an_image);break;case plupload.IMAGE_MEMORY_ERROR:wpFileError(d,pluploadL10n.image_memory_exceeded);break;case plupload.IMAGE_DIMENSIONS_ERROR:wpFileError(d,pluploadL10n.image_dimensions_exceeded);break;case plupload.GENERIC_ERROR:wpQueueError(pluploadL10n.upload_failed);break;case plupload.IO_ERROR:a=parseInt(e.settings.max_file_size,10);if(a>b&&d.size>b){wpFileError(d,pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s",""))}else{wpQueueError(pluploadL10n.io_error)}break;case plupload.HTTP_ERROR:wpQueueError(pluploadL10n.http_error);break;case plupload.INIT_ERROR:jQuery(".media-upload-form").addClass("html-uploader");break;case plupload.SECURITY_ERROR:wpQueueError(pluploadL10n.security_error);break;default:wpFileError(d,pluploadL10n.default_error)}}function uploadSizeError(a,b,d){var c;if(d){c=pluploadL10n.big_upload_queued.replace("%s",b.name)+" "+pluploadL10n.big_upload_failed.replace("%1$s",'').replace("%2$s","")}else{c=pluploadL10n.file_exceeds_size_limit.replace("%s",b.name)}jQuery("#media-items").append('

'+c+"

");a.removeFile(b)}jQuery(document).ready(function(a){a(".media-upload-form").bind("click.uploader",function(f){var d=a(f.target),b,g;if(d.is('input[type="radio"]')){b=d.closest("tr");if(b.hasClass("align")){setUserSetting("align",d.val())}else{if(b.hasClass("image-size")){setUserSetting("imgsize",d.val())}}}else{if(d.is("button.button")){g=f.target.className||"";g=g.match(/url([^ '"]+)/);if(g&&g[1]){setUserSetting("urlbutton",g[1]);d.siblings(".urlfield").val(d.data("link-url"))}}else{if(d.is("a.dismiss")){d.parents(".media-item").fadeOut(200,function(){a(this).remove()})}else{if(d.is(".upload-flash-bypass a")||d.is("a.uploader-html")){a("#media-items, p.submit, span.big-file-warning").css("display","none");switchUploader(0);f.preventDefault()}else{if(d.is(".upload-html-bypass a")){a("#media-items, p.submit, span.big-file-warning").css("display","");switchUploader(1);f.preventDefault()}else{if(d.is("a.describe-toggle-on")){d.parent().addClass("open");d.siblings(".slidetoggle").fadeIn(250,function(){var i=a(window).scrollTop(),e=a(window).height(),k=a(this).offset().top,j=a(this).height(),c,l;if(e&&k&&j){c=k+j;l=i+e;if(c>l){if(c-lc&&f.size>c&&d.runtime!="html5"){uploadSizeError(d,f,true)}else{fileQueued(f)}});d.refresh();d.start()});uploader.bind("BeforeUpload",function(b,c){});uploader.bind("UploadFile",function(b,c){fileUploading(b,c)});uploader.bind("UploadProgress",function(b,c){uploadProgress(b,c)});uploader.bind("Error",function(b,c){uploadError(c.file,c.code,c.message,b);b.refresh()});uploader.bind("FileUploaded",function(b,d,c){uploadSuccess(d,c.response)});uploader.bind("UploadComplete",function(b,c){uploadComplete()})};if(typeof(wpUploaderInit)=="object"){uploader_init()}}); \ No newline at end of file diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/swfupload/handlers.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/swfupload/handlers.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/swfupload/handlers.js 2012-08-22 19:04:18.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/swfupload/handlers.js 2013-06-20 22:46:51.000000000 -0500 *************** *** 15,21 **** jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden'); } // Create a progress bar containing the filename ! jQuery('#media-items').append('
' + fileObj.name + '
'); // Display the progress div jQuery('.progress', '#media-item-' + fileObj.id).show(); --- 15,26 ---- jQuery('.slidetoggle').slideUp(200).siblings().removeClass('hidden'); } // Create a progress bar containing the filename ! jQuery('
') ! .attr( 'id', 'media-item-' + fileObj.id ) ! .addClass('child-of-' + post_id) ! .append('
', ! jQuery('
').text( ' ' + fileObj.name )) ! .appendTo( jQuery('#media-items' ) ); // Display the progress div jQuery('.progress', '#media-item-' + fileObj.id).show(); diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/swfupload/handlers.min.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/swfupload/handlers.min.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/swfupload/handlers.min.js 2012-08-22 19:04:18.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/swfupload/handlers.min.js 2013-06-21 02:20:58.000000000 -0500 *************** *** 1 **** ! var topWin=window.dialogArguments||opener||parent||top;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(a){jQuery(".media-blank").remove();if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".describe-toggle-on").show();jQuery(".describe-toggle-off").hide();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery("#media-items").append('
'+a.name+"
");jQuery(".progress","#media-item-"+a.id).show();jQuery("#insert-gallery").prop("disabled",true);jQuery("#cancel-upload").prop("disabled",false)}function uploadStart(a){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery("#media-items").width()-2,c=jQuery("#media-item-"+e.id);jQuery(".bar",c).width(a*b/d);jQuery(".percent",c).html(Math.ceil(b/d*100)+"%");if(b==d){jQuery(".bar",c).html(''+swfuploadL10n.crunching+"")}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);jQuery(".bar",b).remove();jQuery(".progress",b).hide();try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.toggle",a).click(function(){jQuery(this).siblings(".slidetoggle").slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&&e&&f){c=e+f;if(c>d&&(f+48)d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(".toggle").andSelf().toggle();jQuery(this).siblings("a.toggle").focus();return false});jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery("a.describe-toggle-on, .menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").slideToggle(500).siblings(".toggle").toggle()}function itemAjaxError(d,b){var c=jQuery("#media-item-"+d);var a=jQuery(".filename",c).text();c.html('
'+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
"+b+"
");c.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+swfuploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function updateMediaForm(){var b=jQuery("form.type-form #media-items").children(),a=jQuery("#media-items").children();if(b.length==1){jQuery(".slidetoggle",b).slideDown(500).siblings().addClass("hidden").filter(".toggle").toggle()}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}if(a.length>1){jQuery(".insert-gallery").show()}else{jQuery(".insert-gallery").hide()}}function uploadSuccess(b,a){if(a.match("media-upload-error")){jQuery("#media-item-"+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery("#media-item-"+b.id).hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function uploadComplete(a){if(swfu.getStats().files_queued==0){jQuery("#cancel-upload").prop("disabled",true);jQuery("#insert-gallery").prop("disabled",false)}}function wpQueueError(a){jQuery("#media-upload-error").show().text(a)}function wpFileError(d,c){var b=jQuery("#media-item-"+d.id);var a=jQuery(".filename",b).text();b.html('
'+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
"+c+"
");b.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function fileQueueError(c,a,b){if(a==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){wpQueueError(swfuploadL10n.queue_limit_exceeded)}else{if(a==SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT){fileQueued(c);wpFileError(c,swfuploadL10n.file_exceeds_size_limit)}else{if(a==SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE){fileQueued(c);wpFileError(c,swfuploadL10n.zero_byte_file)}else{if(a==SWFUpload.QUEUE_ERROR.INVALID_FILETYPE){fileQueued(c);wpFileError(c,swfuploadL10n.invalid_filetype)}else{wpQueueError(swfuploadL10n.default_error)}}}}}function fileDialogComplete(b){try{if(b>0){this.startUpload()}}catch(a){this.debug(a)}}function switchUploader(b){var c=document.getElementById(swfu.customSettings.swfupload_element_id),a=document.getElementById(swfu.customSettings.degraded_element_id);if(b){c.style.display="block";a.style.display="none"}else{c.style.display="none";a.style.display="block"}}function swfuploadPreLoad(){if(!uploaderMode){switchUploader(1)}else{switchUploader(0)}}function swfuploadLoadFailed(){switchUploader(0);jQuery(".upload-html-bypass").hide()}function uploadError(b,c,a){switch(c){case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:wpFileError(b,swfuploadL10n.missing_upload_url);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:wpFileError(b,swfuploadL10n.upload_limit_exceeded);break;case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:wpQueueError(swfuploadL10n.http_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:wpQueueError(swfuploadL10n.upload_failed);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:wpQueueError(swfuploadL10n.io_error);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:wpQueueError(swfuploadL10n.security_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:jQuery("#media-item-"+b.id).remove();break;default:wpFileError(b,swfuploadL10n.default_error)}}function cancelUpload(){swfu.cancelQueue()}jQuery(document).ready(function(a){a('input[type="radio"]',"#media-items").live("click",function(){var b=a(this).closest("tr");if(a(b).hasClass("align")){setUserSetting("align",a(this).val())}else{if(a(b).hasClass("image-size")){setUserSetting("imgsize",a(this).val())}}});a("button.button","#media-items").live("click",function(){var b=this.className||"";b=b.match(/url([^ '"]+)/);if(b&&b[1]){setUserSetting("urlbutton",b[1]);a(this).siblings(".urlfield").val(a(this).attr("title"))}})}); \ No newline at end of file --- 1 ---- ! var topWin=window.dialogArguments||opener||parent||top;function fileDialogStart(){jQuery("#media-upload-error").empty()}function fileQueued(a){jQuery(".media-blank").remove();if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".describe-toggle-on").show();jQuery(".describe-toggle-off").hide();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery('
').attr("id","media-item-"+a.id).addClass("child-of-"+post_id).append('
',jQuery('
').text(" "+a.name)).appendTo(jQuery("#media-items"));jQuery(".progress","#media-item-"+a.id).show();jQuery("#insert-gallery").prop("disabled",true);jQuery("#cancel-upload").prop("disabled",false)}function uploadStart(a){try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").unbind("click",topWin.tb_remove)}}catch(b){}return true}function uploadProgress(e,b,d){var a=jQuery("#media-items").width()-2,c=jQuery("#media-item-"+e.id);jQuery(".bar",c).width(a*b/d);jQuery(".percent",c).html(Math.ceil(b/d*100)+"%");if(b==d){jQuery(".bar",c).html(''+swfuploadL10n.crunching+"")}}function prepareMediaItem(c,a){var d=(typeof shortform=="undefined")?1:2,b=jQuery("#media-item-"+c.id);jQuery(".bar",b).remove();jQuery(".progress",b).hide();try{if(typeof topWin.tb_remove!="undefined"){topWin.jQuery("#TB_overlay").click(topWin.tb_remove)}}catch(g){}if(isNaN(a)||!a){b.append(a);prepareMediaItemInit(c)}else{b.load("async-upload.php",{attachment_id:a,fetch:d},function(){prepareMediaItemInit(c);updateMediaForm()})}}function prepareMediaItemInit(b){var a=jQuery("#media-item-"+b.id);jQuery(".thumbnail",a).clone().attr("class","pinkynail toggle").prependTo(a);jQuery(".filename.original",a).replaceWith(jQuery(".filename.new",a));jQuery("a.toggle",a).click(function(){jQuery(this).siblings(".slidetoggle").slideToggle(350,function(){var d=jQuery(window).height(),e=jQuery(this).offset().top,f=jQuery(this).height(),c;if(d&&e&&f){c=e+f;if(c>d&&(f+48)d){window.scrollTo(0,e-36)}}}});jQuery(this).siblings(".toggle").andSelf().toggle();jQuery(this).siblings("a.toggle").focus();return false});jQuery("a.delete",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",success:deleteSuccess,error:deleteError,id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"trash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")}});return false});jQuery("a.undo",a).click(function(){jQuery.ajax({url:ajaxurl,type:"post",id:b.id,data:{id:this.id.replace(/[^0-9]/g,""),action:"untrash-post",_ajax_nonce:this.href.replace(/^.*wpnonce=/,"")},success:function(d,e){var c=jQuery("#media-item-"+b.id);if(type=jQuery("#type-of-"+b.id).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-0+1)}if(c.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-0+1)}jQuery(".filename .trashnotice",c).remove();jQuery(".filename .title",c).css("font-weight","normal");jQuery("a.undo",c).addClass("hidden");jQuery("a.describe-toggle-on, .menu_order_input",c).show();c.css({backgroundColor:"#ceb"}).animate({backgroundColor:"#fff"},{queue:false,duration:500,complete:function(){jQuery(this).css({backgroundColor:""})}}).removeClass("undo")}});return false});jQuery("#media-item-"+b.id+".startopen").removeClass("startopen").slideToggle(500).siblings(".toggle").toggle()}function itemAjaxError(d,b){var c=jQuery("#media-item-"+d);var a=jQuery(".filename",c).text();c.html('
'+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
"+b+"
");c.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function deleteSuccess(b,d){if(b=="-1"){return itemAjaxError(this.id,"You do not have permission. Has your session expired?")}if(b=="0"){return itemAjaxError(this.id,"Could not be deleted. Has it been deleted already?")}var c=this.id,a=jQuery("#media-item-"+c);if(type=jQuery("#type-of-"+c).val()){jQuery("#"+type+"-counter").text(jQuery("#"+type+"-counter").text()-1)}if(a.hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(jQuery("#attachments-count").text()-1)}if(jQuery("form.type-form #media-items").children().length==1&&jQuery(".hidden","#media-items").length>0){jQuery(".toggle").toggle();jQuery(".slidetoggle").slideUp(200).siblings().removeClass("hidden")}jQuery(".toggle",a).toggle();jQuery(".slidetoggle",a).slideUp(200).siblings().removeClass("hidden");a.css({backgroundColor:"#faa"}).animate({backgroundColor:"#f4f4f4"},{queue:false,duration:500}).addClass("undo");jQuery(".filename:empty",a).remove();jQuery(".filename .title",a).css("font-weight","bold");jQuery(".filename",a).append(' '+swfuploadL10n.deleted+" ").siblings("a.toggle").hide();jQuery(".filename",a).append(jQuery("a.undo",a).removeClass("hidden"));jQuery(".menu_order_input",a).hide();return}function deleteError(c,b,a){}function updateMediaForm(){var b=jQuery("form.type-form #media-items").children(),a=jQuery("#media-items").children();if(b.length==1){jQuery(".slidetoggle",b).slideDown(500).siblings().addClass("hidden").filter(".toggle").toggle()}if(a.not(".media-blank").length>0){jQuery(".savebutton").show()}else{jQuery(".savebutton").hide()}if(a.length>1){jQuery(".insert-gallery").show()}else{jQuery(".insert-gallery").hide()}}function uploadSuccess(b,a){if(a.match("media-upload-error")){jQuery("#media-item-"+b.id).html(a);return}prepareMediaItem(b,a);updateMediaForm();if(jQuery("#media-item-"+b.id).hasClass("child-of-"+post_id)){jQuery("#attachments-count").text(1*jQuery("#attachments-count").text()+1)}}function uploadComplete(a){if(swfu.getStats().files_queued==0){jQuery("#cancel-upload").prop("disabled",true);jQuery("#insert-gallery").prop("disabled",false)}}function wpQueueError(a){jQuery("#media-upload-error").show().text(a)}function wpFileError(d,c){var b=jQuery("#media-item-"+d.id);var a=jQuery(".filename",b).text();b.html('
'+swfuploadL10n.dismiss+""+swfuploadL10n.error_uploading.replace("%s",a)+"
"+c+"
");b.find("a.dismiss").click(function(){jQuery(this).parents(".media-item").slideUp(200,function(){jQuery(this).remove()})})}function fileQueueError(c,a,b){if(a==SWFUpload.QUEUE_ERROR.QUEUE_LIMIT_EXCEEDED){wpQueueError(swfuploadL10n.queue_limit_exceeded)}else{if(a==SWFUpload.QUEUE_ERROR.FILE_EXCEEDS_SIZE_LIMIT){fileQueued(c);wpFileError(c,swfuploadL10n.file_exceeds_size_limit)}else{if(a==SWFUpload.QUEUE_ERROR.ZERO_BYTE_FILE){fileQueued(c);wpFileError(c,swfuploadL10n.zero_byte_file)}else{if(a==SWFUpload.QUEUE_ERROR.INVALID_FILETYPE){fileQueued(c);wpFileError(c,swfuploadL10n.invalid_filetype)}else{wpQueueError(swfuploadL10n.default_error)}}}}}function fileDialogComplete(b){try{if(b>0){this.startUpload()}}catch(a){this.debug(a)}}function switchUploader(b){var c=document.getElementById(swfu.customSettings.swfupload_element_id),a=document.getElementById(swfu.customSettings.degraded_element_id);if(b){c.style.display="block";a.style.display="none"}else{c.style.display="none";a.style.display="block"}}function swfuploadPreLoad(){if(!uploaderMode){switchUploader(1)}else{switchUploader(0)}}function swfuploadLoadFailed(){switchUploader(0);jQuery(".upload-html-bypass").hide()}function uploadError(b,c,a){switch(c){case SWFUpload.UPLOAD_ERROR.MISSING_UPLOAD_URL:wpFileError(b,swfuploadL10n.missing_upload_url);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_LIMIT_EXCEEDED:wpFileError(b,swfuploadL10n.upload_limit_exceeded);break;case SWFUpload.UPLOAD_ERROR.HTTP_ERROR:wpQueueError(swfuploadL10n.http_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_FAILED:wpQueueError(swfuploadL10n.upload_failed);break;case SWFUpload.UPLOAD_ERROR.IO_ERROR:wpQueueError(swfuploadL10n.io_error);break;case SWFUpload.UPLOAD_ERROR.SECURITY_ERROR:wpQueueError(swfuploadL10n.security_error);break;case SWFUpload.UPLOAD_ERROR.UPLOAD_STOPPED:case SWFUpload.UPLOAD_ERROR.FILE_CANCELLED:jQuery("#media-item-"+b.id).remove();break;default:wpFileError(b,swfuploadL10n.default_error)}}function cancelUpload(){swfu.cancelQueue()}jQuery(document).ready(function(a){a('input[type="radio"]',"#media-items").live("click",function(){var b=a(this).closest("tr");if(a(b).hasClass("align")){setUserSetting("align",a(this).val())}else{if(a(b).hasClass("image-size")){setUserSetting("imgsize",a(this).val())}}});a("button.button","#media-items").live("click",function(){var b=this.className||"";b=b.match(/url([^ '"]+)/);if(b&&b[1]){setUserSetting("urlbutton",b[1]);a(this).siblings(".urlfield").val(a(this).attr("title"))}})}); \ No newline at end of file diff -crBPN --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=wp-config.php --exclude=wordpress.sql --exclude=.htaccess-dist --exclude=wp-cache-config.php --exclude=editor_plugin.js --exclude=jetpack --exclude=.files.list --exclude=wordpress-3.5.2.pl /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/swfupload/swfupload-all.js /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/swfupload/swfupload-all.js *** /home/packages/code/qi/SOURCES/wordpress-3.5.1/wp-includes/js/swfupload/swfupload-all.js 2011-07-29 14:21:21.000000000 -0500 --- /home/packages/code/qi/SOURCES/wordpress-3.5.2/wp-includes/js/swfupload/swfupload-all.js 1969-12-31 18:00:00.000000000 -0600 *************** *** 1,8 **** - // swfupload - var SWFUpload;if(SWFUpload==undefined){SWFUpload=function(a){this.initSWFUpload(a)}}SWFUpload.prototype.initSWFUpload=function(b){try{this.customSettings={};this.settings=b;this.eventQueue=[];this.movieName="SWFUpload_"+SWFUpload.movieCount++;this.movieElement=null;SWFUpload.instances[this.movieName]=this;this.initSettings();this.loadFlash()}catch(a){delete SWFUpload.instances[this.movieName];throw a}};SWFUpload.instances={};SWFUpload.movieCount=0;SWFUpload.version="2.2.0 2009-03-25";SWFUpload.QUEUE_ERROR={QUEUE_LIMIT_EXCEEDED:-100,FILE_EXCEEDS_SIZE_LIMIT:-110,ZERO_BYTE_FILE:-120,INVALID_FILETYPE:-130};SWFUpload.UPLOAD_ERROR={HTTP_ERROR:-200,MISSING_UPLOAD_URL:-210,IO_ERROR:-220,SECURITY_ERROR:-230,UPLOAD_LIMIT_EXCEEDED:-240,UPLOAD_FAILED:-250,SPECIFIED_FILE_ID_NOT_FOUND:-260,FILE_VALIDATION_FAILED:-270,FILE_CANCELLED:-280,UPLOAD_STOPPED:-290};SWFUpload.FILE_STATUS={QUEUED:-1,IN_PROGRESS:-2,ERROR:-3,COMPLETE:-4,CANCELLED:-5};SWFUpload.BUTTON_ACTION={SELECT_FILE:-100,SELECT_FILES:-110,START_UPLOAD:-120};SWFUpload.CURSOR={ARROW:-1,HAND:-2};SWFUpload.WINDOW_MODE={WINDOW:"window",TRANSPARENT:"transparent",OPAQUE:"opaque"};SWFUpload.completeURL=function(a){if(typeof(a)!=="string"||a.match(/^https?:\/\//i)||a.match(/^\//)){return a}var c,b;c=window.location.protocol+"//"+window.location.hostname+(window.location.port?":"+window.location.port:"");b=window.location.pathname.lastIndexOf("/");if(b<=0){path="/"}else{path=window.location.pathname.substr(0,b)+"/"}return path+a};SWFUpload.prototype.initSettings=function(){this.ensureDefault=function(b,a){this.settings[b]=(this.settings[b]==undefined)?a:this.settings[b]};this.ensureDefault("upload_url","");this.ensureDefault("preserve_relative_urls",false);this.ensureDefault("file_post_name","Filedata");this.ensureDefault("post_params",{});this.ensureDefault("use_query_string",false);this.ensureDefault("requeue_on_error",false);this.ensureDefault("http_success",[]);this.ensureDefault("assume_success_timeout",0);this.ensureDefault("file_types","*.*");this.ensureDefault("file_types_description","All Files");this.ensureDefault("file_size_limit",0);this.ensureDefault("file_upload_limit",0);this.ensureDefault("file_queue_limit",0);this.ensureDefault("flash_url","swfupload.swf");this.ensureDefault("prevent_swf_caching",true);this.ensureDefault("button_image_url","");this.ensureDefault("button_width",1);this.ensureDefault("button_height",1);this.ensureDefault("button_text","");this.ensureDefault("button_text_style","color: #000000; font-size: 16pt;");this.ensureDefault("button_text_top_padding",0);this.ensureDefault("button_text_left_padding",0);this.ensureDefault("button_action",SWFUpload.BUTTON_ACTION.SELECT_FILES);this.ensureDefault("button_disabled",false);this.ensureDefault("button_placeholder_id","");this.ensureDefault("button_placeholder",null);this.ensureDefault("button_cursor",SWFUpload.CURSOR.ARROW);this.ensureDefault("button_window_mode",SWFUpload.WINDOW_MODE.WINDOW);this.ensureDefault("debug",false);this.settings.debug_enabled=this.settings.debug;this.settings.return_upload_start_handler=this.returnUploadStart;this.ensureDefault("swfupload_loaded_handler",null);this.ensureDefault("file_dialog_start_handler",null);this.ensureDefault("file_queued_handler",null);this.ensureDefault("file_queue_error_handler",null);this.ensureDefault("file_dialog_complete_handler",null);this.ensureDefault("upload_start_handler",null);this.ensureDefault("upload_progress_handler",null);this.ensureDefault("upload_error_handler",null);this.ensureDefault("upload_success_handler",null);this.ensureDefault("upload_complete_handler",null);this.ensureDefault("debug_handler",this.debugMessage);this.ensureDefault("custom_settings",{});this.customSettings=this.settings.custom_settings;if(!!this.settings.prevent_swf_caching){this.settings.flash_url=this.settings.flash_url+(this.settings.flash_url.indexOf("?")<0?"?":"&")+"preventswfcaching="+new Date().getTime()}if(!this.settings.preserve_relative_urls){this.settings.upload_url=SWFUpload.completeURL(this.settings.upload_url);this.settings.button_image_url=SWFUpload.completeURL(this.settings.button_image_url)}delete this.ensureDefault};SWFUpload.prototype.loadFlash=function(){var a,b;if(document.getElementById(this.movieName)!==null){throw"ID "+this.movieName+" is already in use. The Flash Object could not be added"}a=document.getElementById(this.settings.button_placeholder_id)||this.settings.button_placeholder;if(a==undefined){throw"Could not find the placeholder element: "+this.settings.button_placeholder_id}b=document.createElement("div");b.innerHTML=this.getFlashHTML();a.parentNode.replaceChild(b.firstChild,a);if(window[this.movieName]==undefined){window[this.movieName]=this.getMovieElement()}};SWFUpload.prototype.getFlashHTML=function(){return['','','','','','','',""].join("")};SWFUpload.prototype.getFlashVars=function(){var b=this.buildParamString(),a=this.settings.http_success.join(",");return["movieName=",encodeURIComponent(this.movieName),"&uploadURL=",encodeURIComponent(this.settings.upload_url),"&useQueryString=",encodeURIComponent(this.settings.use_query_string),"&requeueOnError=",encodeURIComponent(this.settings.requeue_on_error),"&httpSuccess=",encodeURIComponent(a),"&assumeSuccessTimeout=",encodeURIComponent(this.settings.assume_success_timeout),"&params=",encodeURIComponent(b),"&filePostName=",encodeURIComponent(this.settings.file_post_name),"&fileTypes=",encodeURIComponent(this.settings.file_types),"&fileTypesDescription=",encodeURIComponent(this.settings.file_types_description),"&fileSizeLimit=",encodeURIComponent(this.settings.file_size_limit),"&fileUploadLimit=",encodeURIComponent(this.settings.file_upload_limit),"&fileQueueLimit=",encodeURIComponent(this.settings.file_queue_limit),"&debugEnabled=",encodeURIComponent(this.settings.debug_enabled),"&buttonImageURL=",encodeURIComponent(this.settings.button_image_url),"&buttonWidth=",encodeURIComponent(this.settings.button_width),"&buttonHeight=",encodeURIComponent(this.settings.button_height),"&buttonText=",encodeURIComponent(this.settings.button_text),"&buttonTextTopPadding=",encodeURIComponent(this.settings.button_text_top_padding),"&buttonTextLeftPadding=",encodeURIComponent(this.settings.button_text_left_padding),"&buttonTextStyle=",encodeURIComponent(this.settings.button_text_style),"&buttonAction=",encodeURIComponent(this.settings.button_action),"&buttonDisabled=",encodeURIComponent(this.settings.button_disabled),"&buttonCursor=",encodeURIComponent(this.settings.button_cursor)].join("")};SWFUpload.prototype.getMovieElement=function(){if(this.movieElement==undefined){this.movieElement=document.getElementById(this.movieName)}if(this.movieElement===null){throw"Could not find Flash element"}return this.movieElement};SWFUpload.prototype.buildParamString=function(){var c=this.settings.post_params,b=[],a;if(typeof(c)==="object"){for(a in c){if(c.hasOwnProperty(a)){b.push(encodeURIComponent(a.toString())+"="+encodeURIComponent(c[a].toString()))}}}return b.join("&")};SWFUpload.prototype.destroy=function(){try{this.cancelUpload(null,false);var a=null,c;a=this.getMovieElement();if(a&&typeof(a.CallFunction)==="unknown"){for(c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(e){}}try{a.parentNode.removeChild(a)}catch(b){}}window[this.movieName]=null;SWFUpload.instances[this.movieName]=null;delete SWFUpload.instances[this.movieName];this.movieElement=null;this.settings=null;this.customSettings=null;this.eventQueue=null;this.movieName=null;return true}catch(d){return false}};SWFUpload.prototype.addSetting=function(b,c,a){if(c==undefined){return(this.settings[b]=a)}else{return(this.settings[b]=c)}};SWFUpload.prototype.getSetting=function(a){if(this.settings[a]!=undefined){return this.settings[a]}return""};SWFUpload.prototype.callFlash=function(functionName,argumentArray){argumentArray=argumentArray||[];var movieElement=this.getMovieElement(),returnValue,returnString;try{returnString=movieElement.CallFunction(''+__flash__argumentsToXML(argumentArray,0)+"");returnValue=eval(returnString)}catch(ex){throw"Call to "+functionName+" failed"}if(returnValue!=undefined&&typeof returnValue.post==="object"){returnValue=this.unescapeFilePostParams(returnValue)}return returnValue};SWFUpload.prototype.selectFile=function(){this.callFlash("SelectFile")};SWFUpload.prototype.selectFiles=function(){this.callFlash("SelectFiles")};SWFUpload.prototype.startUpload=function(a){this.callFlash("StartUpload",[a])};SWFUpload.prototype.cancelUpload=function(a,b){if(b!==false){b=true}this.callFlash("CancelUpload",[a,b])};SWFUpload.prototype.stopUpload=function(){this.callFlash("StopUpload")};SWFUpload.prototype.getStats=function(){return this.callFlash("GetStats")};SWFUpload.prototype.setStats=function(a){this.callFlash("SetStats",[a])};SWFUpload.prototype.getFile=function(a){if(typeof(a)==="number"){return this.callFlash("GetFileByIndex",[a])}else{return this.callFlash("GetFile",[a])}};SWFUpload.prototype.addFileParam=function(a,b,c){return this.callFlash("AddFileParam",[a,b,c])};SWFUpload.prototype.removeFileParam=function(a,b){this.callFlash("RemoveFileParam",[a,b])};SWFUpload.prototype.setUploadURL=function(a){this.settings.upload_url=a.toString();this.callFlash("SetUploadURL",[a])};SWFUpload.prototype.setPostParams=function(a){this.settings.post_params=a;this.callFlash("SetPostParams",[a])};SWFUpload.prototype.addPostParam=function(a,b){this.settings.post_params[a]=b;this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.removePostParam=function(a){delete this.settings.post_params[a];this.callFlash("SetPostParams",[this.settings.post_params])};SWFUpload.prototype.setFileTypes=function(a,b){this.settings.file_types=a;this.settings.file_types_description=b;this.callFlash("SetFileTypes",[a,b])};SWFUpload.prototype.setFileSizeLimit=function(a){this.settings.file_size_limit=a;this.callFlash("SetFileSizeLimit",[a])};SWFUpload.prototype.setFileUploadLimit=function(a){this.settings.file_upload_limit=a;this.callFlash("SetFileUploadLimit",[a])};SWFUpload.prototype.setFileQueueLimit=function(a){this.settings.file_queue_limit=a;this.callFlash("SetFileQueueLimit",[a])};SWFUpload.prototype.setFilePostName=function(a){this.settings.file_post_name=a;this.callFlash("SetFilePostName",[a])};SWFUpload.prototype.setUseQueryString=function(a){this.settings.use_query_string=a;this.callFlash("SetUseQueryString",[a])};SWFUpload.prototype.setRequeueOnError=function(a){this.settings.requeue_on_error=a;this.callFlash("SetRequeueOnError",[a])};SWFUpload.prototype.setHTTPSuccess=function(a){if(typeof a==="string"){a=a.replace(" ","").split(",")}this.settings.http_success=a;this.callFlash("SetHTTPSuccess",[a])};SWFUpload.prototype.setAssumeSuccessTimeout=function(a){this.settings.assume_success_timeout=a;this.callFlash("SetAssumeSuccessTimeout",[a])};SWFUpload.prototype.setDebugEnabled=function(a){this.settings.debug_enabled=a;this.callFlash("SetDebugEnabled",[a])};SWFUpload.prototype.setButtonImageURL=function(a){if(a==undefined){a=""}this.settings.button_image_url=a;this.callFlash("SetButtonImageURL",[a])};SWFUpload.prototype.setButtonDimensions=function(c,a){this.settings.button_width=c;this.settings.button_height=a;var b=this.getMovieElement();if(b!=undefined){b.style.width=c+"px";b.style.height=a+"px"}this.callFlash("SetButtonDimensions",[c,a])};SWFUpload.prototype.setButtonText=function(a){this.settings.button_text=a;this.callFlash("SetButtonText",[a])};SWFUpload.prototype.setButtonTextPadding=function(b,a){this.settings.button_text_top_padding=a;this.settings.button_text_left_padding=b;this.callFlash("SetButtonTextPadding",[b,a])};SWFUpload.prototype.setButtonTextStyle=function(a){this.settings.button_text_style=a;this.callFlash("SetButtonTextStyle",[a])};SWFUpload.prototype.setButtonDisabled=function(a){this.settings.button_disabled=a;this.callFlash("SetButtonDisabled",[a])};SWFUpload.prototype.setButtonAction=function(a){this.settings.button_action=a;this.callFlash("SetButtonAction",[a])};SWFUpload.prototype.setButtonCursor=function(a){this.settings.button_cursor=a;this.callFlash("SetButtonCursor",[a])};SWFUpload.prototype.queueEvent=function(b,c){if(c==undefined){c=[]}else{if(!(c instanceof Array)){c=[c]}}var a=this;if(typeof this.settings[b]==="function"){this.eventQueue.push(function(){this.settings[b].apply(this,c)});setTimeout(function(){a.executeNextEvent()},0)}else{if(this.settings[b]!==null){throw"Event handler "+b+" is unknown or is not a function"}}};SWFUpload.prototype.executeNextEvent=function(){var a=this.eventQueue?this.eventQueue.shift():null;if(typeof(a)==="function"){a.apply(this)}};SWFUpload.prototype.unescapeFilePostParams=function(c){var e=/[$]([0-9a-f]{4})/i,f={},d,a,b;if(c!=undefined){for(a in c.post){if(c.post.hasOwnProperty(a)){d=a;while((b=e.exec(d))!==null){d=d.replace(b[0],String.fromCharCode(parseInt("0x"+b[1],16)))}f[d]=c.post[a]}}c.post=f}return c};SWFUpload.prototype.testExternalInterface=function(){try{return this.callFlash("TestExternalInterface")}catch(a){return false}};SWFUpload.prototype.flashReady=function(){var a=this.getMovieElement();if(!a){this.debug("Flash called back ready but the flash movie can't be found.");return}this.cleanUp(a);this.queueEvent("swfupload_loaded_handler")};SWFUpload.prototype.cleanUp=function(a){var c;try{if(this.movieElement&&typeof(a.CallFunction)==="unknown"){this.debug("Removing Flash functions hooks (this should only run in IE and should prevent memory leaks)");for(c in a){try{if(typeof(a[c])==="function"){a[c]=null}}catch(b){}}}}catch(d){}window.__flash__removeCallback=function(e,f){try{if(e){e[f]=null}}catch(g){}}};SWFUpload.prototype.fileDialogStart=function(){this.queueEvent("file_dialog_start_handler")};SWFUpload.prototype.fileQueued=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("file_queued_handler",a)};SWFUpload.prototype.fileQueueError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("file_queue_error_handler",[a,c,b])};SWFUpload.prototype.fileDialogComplete=function(b,c,a){this.queueEvent("file_dialog_complete_handler",[b,c,a])};SWFUpload.prototype.uploadStart=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("return_upload_start_handler",a)};SWFUpload.prototype.returnUploadStart=function(a){var b;if(typeof this.settings.upload_start_handler==="function"){a=this.unescapeFilePostParams(a);b=this.settings.upload_start_handler.call(this,a)}else{if(this.settings.upload_start_handler!=undefined){throw"upload_start_handler must be a function"}}if(b===undefined){b=true}b=!!b;this.callFlash("ReturnUploadStart",[b])};SWFUpload.prototype.uploadProgress=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_progress_handler",[a,c,b])};SWFUpload.prototype.uploadError=function(a,c,b){a=this.unescapeFilePostParams(a);this.queueEvent("upload_error_handler",[a,c,b])};SWFUpload.prototype.uploadSuccess=function(b,a,c){b=this.unescapeFilePostParams(b);this.queueEvent("upload_success_handler",[b,a,c])};SWFUpload.prototype.uploadComplete=function(a){a=this.unescapeFilePostParams(a);this.queueEvent("upload_complete_handler",a)};SWFUpload.prototype.debug=function(a){this.queueEvent("debug_handler",a)}; - // swfupload.queue - var SWFUpload;if(typeof(SWFUpload)==="function"){SWFUpload.queue={};SWFUpload.prototype.initSettings=(function(a){return function(){if(typeof(a)==="function"){a.call(this)}this.queueSettings={};this.queueSettings.queue_cancelled_flag=false;this.queueSettings.queue_upload_count=0;this.queueSettings.user_upload_complete_handler=this.settings.upload_complete_handler;this.queueSettings.user_upload_start_handler=this.settings.upload_start_handler;this.settings.upload_complete_handler=SWFUpload.queue.uploadCompleteHandler;this.settings.upload_start_handler=SWFUpload.queue.uploadStartHandler;this.settings.queue_complete_handler=this.settings.queue_complete_handler||null}})(SWFUpload.prototype.initSettings);SWFUpload.prototype.startUpload=function(a){this.queueSettings.queue_cancelled_flag=false;this.callFlash("StartUpload",[a])};SWFUpload.prototype.cancelQueue=function(){this.queueSettings.queue_cancelled_flag=true;this.stopUpload();var a=this.getStats();while(a.files_queued>0){this.cancelUpload();a=this.getStats()}};SWFUpload.queue.uploadStartHandler=function(a){var b;if(typeof(this.queueSettings.user_upload_start_handler)==="function"){b=this.queueSettings.user_upload_start_handler.call(this,a)}b=(b===false)?false:true;this.queueSettings.queue_cancelled_flag=!b;return b};SWFUpload.queue.uploadCompleteHandler=function(b){var c=this.queueSettings.user_upload_complete_handler,d,a;if(b.filestatus===SWFUpload.FILE_STATUS.COMPLETE){this.queueSettings.queue_upload_count++}if(typeof(c)==="function"){d=(c.call(this,b)===false)?false:true}else{if(b.filestatus===SWFUpload.FILE_STATUS.QUEUED){d=false}else{d=true}}if(d){a=this.getStats();if(a.files_queued>0&&this.queueSettings.queue_cancelled_flag===false){this.startUpload()}else{if(this.queueSettings.queue_cancelled_flag===false){this.queueEvent("queue_complete_handler",[this.queueSettings.queue_upload_count]);this.queueSettings.queue_upload_count=0}else{this.queueSettings.queue_cancelled_flag=false;this.queueSettings.queue_upload_count=0}}}}}; - // swfobject - var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("