diff options
| -rw-r--r-- | wp-admin/admin-functions.php | 3 | ||||
| -rw-r--r-- | wp-admin/edit-form-advanced.php | 1 | ||||
| -rw-r--r-- | wpmu-settings.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php index 038eb8c..92ac4cb 100644 --- a/wp-admin/admin-functions.php +++ b/wp-admin/admin-functions.php @@ -1996,7 +1996,8 @@ function autocomplete_css() { } function autocomplete_textbox( $url, $search_field, $results_field ) { ?> -<script src="<?php echo get_option( "siteurl" ) ?>/wp-includes/js/scriptaculous/scriptaculous.js" type="text/javascript"></script> +<script type="text/javascript" src="<?php echo get_option( "siteurl" ) ?>/wp-includes/js/scriptaculous/prototype.js"></script> +<script type="text/javascript" src="<?php echo get_option( "siteurl" ) ?>/wp-includes/js/scriptaculous/scriptaculous.js"></script> <script type="text/javascript"> function load_autocompleter() { new Ajax.Autocompleter("<?php echo $search_field ?>", "<?php echo $results_field ?>", "<?php echo $url ?>", {paramName: "search", minChars: 3}); diff --git a/wp-admin/edit-form-advanced.php b/wp-admin/edit-form-advanced.php index 9b2d167..5431ce2 100644 --- a/wp-admin/edit-form-advanced.php +++ b/wp-admin/edit-form-advanced.php @@ -77,7 +77,6 @@ addLoadEvent(focusit); <p id="jaxcat"></p> <?php if ( current_user_can('manage_categories') ) : ?> <div id="searchresults" class="autocomplete"></div> -<br clear='all' /> <?php autocomplete_textbox( "wpmu-edit.php?action=searchcategories&search=", "newcat", "searchresults" ); ?> <?php endif; ?> <ul id="categorychecklist"><?php dropdown_categories(get_settings('default_category')); ?></ul></div> diff --git a/wpmu-settings.php b/wpmu-settings.php index 9cb37d6..eb7e16c 100644 --- a/wpmu-settings.php +++ b/wpmu-settings.php @@ -64,7 +64,7 @@ if( constant( 'VHOST' ) == 'yes' ) { $blogname = substr( $blogname, 0, strpos( $blogname, '/' ) );
if( strpos( $blogname, '?' ) )
$blogname = substr( $blogname, 0, strpos( $blogname, '?' ) );
- if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'files' || $blogname == 'feed' || is_file( $blogname ) ) {
+ if( $blogname == '' || $blogname == 'blog' || $blogname == 'wp-admin' || $blogname == 'wp-includes' || $blogname == 'files' || $blogname == 'feed' || is_file( $blogname ) ) {
$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '$path'");
} else {
$current_blog = $wpdb->get_row("SELECT * FROM $wpdb->blogs WHERE domain = '$domain' AND path = '{$path}{$blogname}/'");
|