Changes from trunk/wp-admin/upgrade.php at r11930 to branches/2.9/wp-admin/upgrade.php at r12578
- File:
-
- 1 edited
-
branches/2.9/wp-admin/upgrade.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/2.9/wp-admin/upgrade.php
r11930 r12578 36 36 $step = (int) $step; 37 37 38 $php_version = phpversion(); 39 $mysql_version = $wpdb->db_version(); 40 $php_compat = version_compare( $php_version, $required_php_version, '>=' ); 41 $mysql_compat = version_compare( $mysql_version, $required_mysql_version, '>=' ) || file_exists( WP_CONTENT_DIR . '/db.php' ); 42 38 43 @header( 'Content-Type: ' . get_option( 'html_type' ) . '; charset=' . get_option( 'blog_charset' ) ); 39 44 ?> … … 54 59 <p class="step"><a class="button" href="<?php echo get_option( 'home' ); ?>/"><?php _e( 'Continue' ); ?></a></p> 55 60 61 <?php elseif ( !$php_compat || !$mysql_compat ) : 62 if ( !$mysql_compat && !$php_compat ) 63 printf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ); 64 elseif ( !$php_compat ) 65 printf( __('You cannot upgrade because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ); 66 elseif ( !$mysql_compat ) 67 printf( __('You cannot upgrade because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ); 68 ?> 56 69 <?php else : 57 70 switch ( $step ) :
Note: See TracChangeset
for help on using the changeset viewer.