Changes from branches/2.7/wp-admin/includes/post.php at r10257 to trunk/wp-admin/includes/post.php at r10150

File:

• trunk/wp-admin/includes/post.php (modified) (6 diffs)

trunk/wp-admin/includes/post.php

@@ -229 +229 @@
         $post_data = &$_POST;
 
-    if ( isset($post_data['post_type']) && 'page' == $post_data['post_type'] ) {
+    if ( 'page' == $post_data['post_type'] ) {
         if ( ! current_user_can( 'edit_pages' ) )
             wp_die( __('You are not allowed to edit pages.') );
@@ -237 +237 @@
     }
 
-    $post_IDs = array_map( 'intval', (array) $post_data['post'] );
+    $post_IDs = array_map( intval, (array) $post_data['post'] );
 
     $reset = array( 'post_author', 'post_status', 'post_password', 'post_parent', 'page_template', 'comment_status', 'ping_status', 'keep_private', 'tags_input', 'post_category', 'sticky' );
@@ -910 +910 @@
     }
 
-    $post->filter = 'sample'; 
-
     $permalink = get_permalink($post, true);
 
@@ -929 +927 @@
     $post->post_date = $original_date;
     $post->post_name = $original_name;
-    unset($post->filter);
-
     return $permalink;
 }
@@ -1166 +1162 @@
             if ( ! empty($mce_external_languages) ) {
                 foreach ( $mce_external_languages as $name => $path ) {
-                    if ( @is_file($path) && @is_readable($path) ) {
+                    if ( is_file($path) && is_readable($path) ) {
                         include_once($path);
-                        $ext_plugins .= $strings . "\n";
+                        $ext_plugins .= $strings;
                         $loaded_langs[] = $name;
                     }
@@ -1189 +1185 @@
                         $path = trailingslashit( realpath($path) );
 
-                    if ( @is_file($path . $mce_locale . '.js') )
-                        $strings .= @file_get_contents($path . $mce_locale . '.js') . "\n";
-
-                    if ( @is_file($path . $mce_locale . '_dlg.js') )
-                        $strings .= @file_get_contents($path . $mce_locale . '_dlg.js') . "\n";
+                    if ( is_file($path . $mce_locale . '.js') )
+                        $strings .= @file_get_contents($path . $mce_locale . '.js');
+
+                    if ( is_file($path . $mce_locale . '_dlg.js') )
+                        $strings .= @file_get_contents($path . $mce_locale . '_dlg.js');
 
                     if ( 'en' != $mce_locale && empty($strings) ) {
-                        if ( @is_file($path . 'en.js') ) {
+                        if ( is_file($path . 'en.js') ) {
                             $str1 = @file_get_contents($path . 'en.js');
-                            $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 ) . "\n";
+                            $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str1, 1 );
                         }
 
-                        if ( @is_file($path . 'en_dlg.js') ) {
+                        if ( is_file($path . 'en_dlg.js') ) {
                             $str2 = @file_get_contents($path . 'en_dlg.js');
-                            $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 ) . "\n";
+                            $strings .= preg_replace( '/([\'"])en\./', '$1' . $mce_locale . '.', $str2, 1 );
                         }
                     }