Changes from tags/1.0-RC2 at r1162 to tags/1.0-RC3 at r1162
- Files:
-
- tags/1.0-RC3/test (added)
- tags/1.0-RC3/test/WordPress (added)
- tags/1.0-RC3/test/WordPress/unit (added)
- tags/1.0-RC3/test/WordPress/unit/all_tests.php (added)
- tags/1.0-RC3/test/WordPress/unit/wp-includes (added)
- tags/1.0-RC3/test/WordPress/unit/wp-includes/functions.php (added)
- tags/1.0-RC3/test/WordPress/web (added)
- tags/1.0-RC3/test/WordPress/web/all_tests.php (added)
- tags/1.0-RC3/test/WordPress/web/validation.php (added)
- tags/1.0-RC3/test/WordPress/web/PageValidator.php (added)
- tags/1.0-RC3/test/WordPress/web/config.php (added)
- tags/1.0-RC3/test/ReadMe.txt (added)
- tags/1.0-RC3/logs (added)
- tags/1.0-RC3/script (added)
- tags/1.0-RC3/script/console (added)
- tags/1.0-RC3/script/phpsh (added)
- tags/1.0-RC3/script/phpsh/ansicolor.py (added)
- tags/1.0-RC3/script/phpsh/LICENSE (added)
- tags/1.0-RC3/script/phpsh/phpsh (added)
- tags/1.0-RC3/script/phpsh/ansicolor.pyc (added)
- tags/1.0-RC3/script/phpsh/ctags.py (added)
- tags/1.0-RC3/script/phpsh/phpsh.php (added)
- tags/1.0-RC3/script/phpsh/ctags.pyc (added)
- tags/1.0-RC3/script/phpsh/README (added)
- tags/1.0-RC3/script/compare-wordpress-code (added)
- tags/1.0-RC3/script/console.php (added)
- tags/1.0-RC3/script/compare-wordpress-structure (added)
- tags/1.0-RC3/doc/spec.rtf (added)
- tags/1.0-RC3/src/lib/functions.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-rdf.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-includes/version.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-includes/classes.php (modified) (4 diffs)
- tags/1.0-RC3/src/lyceum/wp-includes/functions.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-content/themes/default/header.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-register.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-atom.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/system-admin/settings.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-admin/post.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-admin/upgrade-functions.php (modified) (1 diff)
- tags/1.0-RC3/src/lyceum/wp-admin/upgrade-schema.php (modified) (1 diff)
- tags/1.0-RC2/dev/logs (deleted)
- tags/1.0-RC2/dev/script (deleted)
- tags/1.0-RC2/dev/spec.rtf (deleted)
- tags/1.0-RC2/dev/ReadMe.txt (deleted)
- tags/1.0-RC2/tests (deleted)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
tags/1.0-RC3/src/lib/functions.php
r1115 r1155 355 355 356 356 function get_url_arg_pairs($url) { 357 $args = parse_url($url, PHP_URL_QUERY); 357 $parsed_url = parse_url($url); 358 $args = $parsed_url['query']; 358 359 $arr = array(); 359 360 foreach (explode('&', $args) as $i) { tags/1.0-RC3/src/lyceum/wp-rdf.php
r967 r1157 27 27 <description><?php bloginfo_rss('description') ?></description> 28 28 <dc:date><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></dc:date> 29 <admin:generatorAgent rdf:resource="http:// wordpress.org/?v=<?php echo $wp_version ?>"/>29 <admin:generatorAgent rdf:resource="http://lyceum.ibiblio.org/?v=<?php echo $wp_version ?>"/> 30 30 <sy:updatePeriod>hourly</sy:updatePeriod> 31 31 <sy:updateFrequency>1</sy:updateFrequency> tags/1.0-RC3/src/lyceum/wp-includes/version.php
r1149 r1161 3 3 // This just holds the version number, in a separate file so we can bump it without cluttering the SVN 4 4 5 $wp_version = '1.0-RC 2';5 $wp_version = '1.0-RC3'; 6 6 $wp_db_version = 3; 7 7 tags/1.0-RC3/src/lyceum/wp-includes/classes.php
r1143 r1159 1423 1423 RewriteRule ^register/? wp-register.php [L,QSA] 1424 1424 1425 $files_exist_cond1426 1425 APACHE; 1427 1426 … … 1430 1429 $b = ''; 1431 1430 $group = '$1'; 1431 $pathleading = ''; 1432 1432 $extra_for_directory = ""; 1433 1433 } else { … … 1435 1435 $b = '?b=$1'; 1436 1436 $group = '$2'; 1437 $pathleading = ('' == $site_root ? '/' : '') . '$1'; 1437 1438 $extra_for_directory = <<<APACHE 1438 1439 RewriteRule {$leading}wp-includes/(.*) wp-includes/$2 [L] … … 1446 1447 $rules .= <<<APACHE 1447 1448 1448 RewriteRule {$leading}admin/?$ wp-admin/index.php$b [L] 1449 1450 ####################################################################### 1451 # 1452 # Build Base URL for Redirects / stored in Apache %{ENV:rwbaseurl} 1453 # 1454 ####################################################################### 1455 RewriteCond %{HTTPS} =on 1456 RewriteRule .* - [E=rwscheme:https,S=1] 1457 RewriteRule .* - [E=rwscheme:http] 1458 1459 # if (HTTPS && port != 443) { use explicit port (eg. :8080), then skip next rule } 1460 RewriteCond %{HTTPS} =on 1461 RewriteCond %{SERVER_PORT} !=443 1462 RewriteRule .* - [E=rwport:\:%{SERVER_PORT},S=1] 1463 1464 # else if (port != 80) { use explicit port } 1465 RewriteCond %{SERVER_PORT} !=80 1466 RewriteRule .* - [E=rwport:\:%{SERVER_PORT}] 1467 1468 # Build complete server portion of url, without trailing slash. 1469 # Using HTTP Header field "Host:", as mod_rewrite's use of HTTP_HOST and SERVER_NAME 1470 # appears to be inconsistent. Subdomains were sometimes rewritten as parent domain. Cause unknown. 1471 RewriteRule .* - [E=rwbaseurl:%{ENV:rwscheme}\://%{HTTP:Host}%{ENV:rwport}] 1472 1473 # Send Redirect 1474 RewriteRule ^admin$ %{ENV:rwbaseurl}/admin/ [R=301,L] 1475 1476 RewriteRule {$leading}admin$ {$pathleading}/admin/ [R=301,NC,L] 1477 RewriteRule {$leading}admin/$ wp-admin/index.php$b [L] 1449 1478 RewriteRule {$leading}admin/?([^/]+php)\??(.*) wp-admin/$group$b [L,QSA] 1450 1479 RewriteRule {$leading}admin/?([^/]+js) wp-admin/$group [L] tags/1.0-RC3/src/lyceum/wp-includes/functions.php
r1100 r1154 1426 1426 $now = current_time('mysql'); 1427 1427 1428 //optimize 1429 $posts = $wpdb->get_results( 1430 "SELECT DISTINCT * FROM $wpdb->posts " . 1431 ( empty( $r['category'] ) ? "" : ", $wpdb->post2cat " ) . 1432 " WHERE post_date <= '$now' AND (post_status = 'publish') ". 1433 ( empty( $r['category'] ) ? "AND $wpdb->posts.blog = '$blog'" : "AND $wpdb->posts.ID = $wpdb->post2cat.post_id AND $wpdb->post2cat.category_id = " . $r['category']. " " ) . 1434 1428 $posts = $wpdb->get_post_results( 1429 "$wpdb->posts.*", 1430 "post_date <= '$now' AND (post_status = 'publish') ". 1431 ( empty( $r['category'] ) ? "" : "AND $wpdb->post2cat.category_id = " . $r['category']. " " ) . 1435 1432 " GROUP BY $wpdb->posts.ID ORDER BY " . $r['orderby'] . " " . $r['order'] . " LIMIT " . $r['offset'] . ',' . $r['numberposts'] ); 1436 1433 tags/1.0-RC3/src/lyceum/wp-content/themes/default/header.php
r1004 r1157 7 7 <title><?php bloginfo('name'); ?> <?php if ( is_single() ) { ?> » Blog Archive <?php } ?> <?php wp_title(); ?></title> 8 8 9 <meta name="generator" content=" WordPress<?php bloginfo('version'); ?>" /> <!-- leave this for stats -->9 <meta name="generator" content="Lyceum <?php bloginfo('version'); ?>" /> <!-- leave this for stats --> 10 10 11 11 <link rel="stylesheet" href="<?php bloginfo('stylesheet_url'); ?>" type="text/css" media="screen" /> tags/1.0-RC3/src/lyceum/wp-register.php
r1140 r1158 102 102 <div id="login"> 103 103 <h1><a href="http://lyceum.ibiblio.org/">Lyceum</a></h1> 104 <h2><?php _e(' RegisterNew Blog') ?></h2>104 <h2><?php _e('Create New Blog') ?></h2> 105 105 You are logged in as: <strong><?php echo $user_login ?></strong> (<a href="login?action=logout">logout</a>)<br/><br/> 106 106 </div> tags/1.0-RC3/src/lyceum/wp-atom.php
r1000 r1157 23 23 <modified><?php echo mysql2date('Y-m-d\TH:i:s\Z', get_lastpostmodified('GMT'), false); ?></modified> 24 24 <copyright>Copyright <?php echo mysql2date('Y', get_lastpostdate('blog'), 0); ?></copyright> 25 <generator url="http:// wordpress.org/" version="<?php bloginfo_rss('version'); ?>">WordPress</generator>25 <generator url="http://lyceum.ibiblio.org/" version="<?php bloginfo_rss('version'); ?>">Lyceum</generator> 26 26 <?php do_action('atom_head'); ?> 27 27 <?php $items_count = 0; if ($posts) { foreach ($posts as $post) { start_wp(); ?> tags/1.0-RC3/src/lyceum/system-admin/settings.php
r1148 r1160 108 108 lyceum_settings_text_input('wp-content_file_path', 'wp-content_file_path', 'The file path where individual blog uploads and cache are kept.', 200) . 109 109 lyceum_settings_text_input('fileupload_base_url', 'File upload base url', 'This needs to work with wp-content_file_path above.') . 110 lyceum_settings_text_input(' blog_charset', 'System character encoding') .110 lyceum_settings_text_input('system_charset', 'System character encoding') . 111 111 lyceum_settings_text_input('email_structure', 'email regex', 'Regular expression against which new email addresses must match (example: <strong>/.*@example\.tld/</strong>)') . 112 112 lyceum_settings_text_input('email_structure_error_message', 'email regex error', '(example: <strong>You must have a example.tld email address in order to make an account.</strong>)') . tags/1.0-RC3/src/lyceum/wp-admin/post.php
r1055 r1156 140 140 $location = remove_token_arg($location); 141 141 $matches=array(); 142 preg_match('/(.*)?\/([^\/]*\.php)/', parse_url($location, PHP_URL_PATH), $matches); 142 $parsed_url = parse_url($location); 143 preg_match('/(.*)?\/([^\/]*\.php)/', $parsed_url['path'], $matches); 143 144 $file = $matches[2]; 144 145 $args = get_url_arg_pairs($location); 145 146 146 if ('post.php' == $file && 'edit' == $args['action']) 147 $location .= '&token=' . formtoken('post.php','edit',$post_ID); 148 147 $location = ( !empty($parsed_url['scheme']) ? $parsed_url['scheme'] . '://' : '' ) . 148 $parsed_url['host'] . $parsed_url['path'] . '?' . $parsed_url['query'] . 149 '&token=' . formtoken('post.php','edit',$post_ID) . 150 '#' . $parsed_url['fragment']; 149 151 wp_redirect($location); // Send user on their way while we keep working 150 152 tags/1.0-RC3/src/lyceum/wp-admin/upgrade-functions.php
r1144 r1160 118 118 $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'siteurl' AND option_domain = 'system'"); 119 119 120 echo '<br/>→ Deleting site-wide blog_charset option. (renamed to system_charset)'; 121 $wpdb->query("DELETE FROM $wpdb->options WHERE option_name = 'blog_charset' AND option_domain = 'system'"); 122 120 123 echo '<br/>→ Creating new post2cat index (See <a href="http://lyceum.ibiblio.org/2007/03/02/last-night-a-b-tree-saved-my-life-or-how-to-do-a-simple-index-audit-to-fix-a-slow-query/">this article</a> for more information).'; 121 124 tags/1.0-RC3/src/lyceum/wp-admin/upgrade-schema.php
r1139 r1160 327 327 add_option('restrict_admin_ip', 0); 328 328 add_option('active_system_plugins'); 329 add_option(' blog_charset', 'UTF-8');329 add_option('system_charset', 'UTF-8'); 330 330 add_option('html_type', 'text/html'); 331 331 add_option('presentation_tab', 1);
