Changeset 11214 for trunk/wp-admin/plugin-editor.php

Timestamp:

05/06/2009 04:08:13 AM (16 years ago)

Author:

ryan

Message:

Die on file error. Cleanup. Props hakre. fixes #9452

File:

• trunk/wp-admin/plugin-editor.php (modified) (6 diffs)

trunk/wp-admin/plugin-editor.php

@@ -85 +85 @@
 
     wp_enqueue_script( 'codepress' );
-    add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );
-    require_once('admin-header.php');
-
-    update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
-
+    add_action( 'admin_print_footer_scripts', 'codepress_footer_js' );  
+    
     // List of allowable extensions
     $editable_extensions = array('php', 'txt', 'text', 'js', 'css', 'html', 'htm', 'xml', 'inc', 'include');
-    $extra_extensions = apply_filters('editable_extensions', null);
-    if ( is_array($extra_extensions) )
-        $editable_extensions = array_merge($editable_extensions, $extra_extensions);
+    $editable_extensions = (array) apply_filters('editable_extensions', $editable_extensions);
 
     if ( ! is_file($real_file) ) {
-        $error = __('No such file exists! Double check the name and try again.');
+        wp_die(sprintf('<p>%s</p>', __('No such file exists! Double check the name and try again.')));
     } else {
         // Get the extension of the file
@@ -104 +99 @@
             // If extension is not in the acceptable list, skip it
             if ( !in_array( $ext, $editable_extensions) )
-                $error = __('Files of this type are not editable.');
+                wp_die(sprintf('<p>%s</p>', __('Files of this type are not editable.')));
         }
     }
-
-    if ( ! $error ) {
-        $content = file_get_contents( $real_file );
-
-        if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
-            $functions = wp_doc_link_parse( $content );
-
-            $docs_select = '<select name="docs-list" id="docs-list">';
-            $docs_select .= '<option value="">' . __( 'Function Name...' ) . '</option>';
-            foreach ( $functions as $function) {
-                $docs_select .= '<option value="' . esc_attr( $function ) . '">' . htmlspecialchars( $function ) . '()</option>';
-            }
-            $docs_select .= '</select>';
+    
+    require_once('admin-header.php');
+    
+    update_recently_edited(WP_PLUGIN_DIR . '/' . $file);
+
+    $content = file_get_contents( $real_file );
+
+    if ( '.php' == substr( $real_file, strrpos( $real_file, '.' ) ) ) {
+        $functions = wp_doc_link_parse( $content );
+
+        $docs_select = '<select name="docs-list" id="docs-list">';
+        $docs_select .= '<option value="">' . __( 'Function Name...' ) . '</option>';
+        foreach ( $functions as $function) {
+            $docs_select .= '<option value="' . esc_attr( $function ) . '">' . htmlspecialchars( $function ) . '()</option>';
         }
-
-        $content = htmlspecialchars( $content );
-        $codepress_lang = codepress_get_lang($real_file);
-    }
+        $docs_select .= '</select>';
+    }
+
+    $content = htmlspecialchars( $content );
+    $codepress_lang = codepress_get_lang($real_file);
 
     ?>
@@ -142 +139 @@
 <div class="bordertitle">
     <form id="themeselector" action="plugin-editor.php" method="post">
-        <strong><label for="theme"><?php _e('Select plugin to edit:'); ?> </label></strong>
+        <strong><label for="plugin"><?php _e('Select plugin to edit:'); ?> </label></strong>
         <select name="plugin" id="plugin">
 <?php
@@ -196 +193 @@
     }
 ?>
-        <li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo $plugin_file; ?>&plugin=<?php echo $plugin; ?>"><?php echo $plugin_file ?></a></li>
+        <li<?php echo $file == $plugin_file ? ' class="highlight"' : ''; ?>><a href="plugin-editor.php?file=<?php echo $plugin_file; ?>&amp;plugin=<?php echo $plugin; ?>"><?php echo $plugin_file ?></a></li>
 <?php endforeach; ?>
     </ul>
     </div>
-<?php   if ( ! $error ) { ?>
     <form name="template" id="template" action="plugin-editor.php" method="post">
     <?php wp_nonce_field('edit-plugin_' . $file) ?>
@@ -209 +205 @@
         </div>
         <?php if ( count( $functions ) ) : ?>
-        <div id="documentation"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Lookup' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&locale=<?php echo urlencode( get_locale() ) ?>&version=<?php echo urlencode( $wp_version ) ?>&redirect=true'); }" /></div>
+        <div id="documentation"><label for="docs-list"><?php _e('Documentation:') ?></label> <?php echo $docs_select ?> <input type="button" class="button" value="<?php esc_attr_e( 'Lookup' ) ?> " onclick="if ( '' != jQuery('#docs-list').val() ) { window.open( 'http://api.wordpress.org/core/handbook/1.0/?function=' + escape( jQuery( '#docs-list' ).val() ) + '&amp;locale=<?php echo urlencode( get_locale() ) ?>&amp;version=<?php echo urlencode( $wp_version ) ?>&amp;redirect=true'); }" /></div>
         <?php endif; ?>
 <?php if ( is_writeable($real_file) ) : ?>
@@ -227 +223 @@
 <?php endif; ?>
  </form>
-<?php
-    } else {
-        echo '<div class="error"><p>' . $error . '</p></div>';
-    }
-?>
 <div class="clear"> &nbsp; </div>
 </div>