Changeset 252
- Timestamp:
- Jun 4, 2009, 2:02:54 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 31 added
- 16 edited
-
external/xpress_i18n/ja_UTF (added)
-
external/xpress_i18n/ja_UTF/language (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8 (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/admin.php (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/blocks.php (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/index.html (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/author_newcomment.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/author_newpost.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/category_newcomment.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/category_newpost.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/global_newcomment.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/global_newpost.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/global_waiting.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/post_editpost.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/mail_template/post_newcomment.tpl (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/main.php (added)
-
external/xpress_i18n/ja_UTF/language/ja_utf8/modinfo.php (added)
-
external/xpress_i18n/ja_UTF/wp-config.php (added)
-
external/xpress_i18n/ja_UTF/wp-content (added)
-
external/xpress_i18n/ja_UTF/wp-content/plugins (added)
-
external/xpress_i18n/ja_UTF/wp-content/plugins/xpressme (added)
-
external/xpress_i18n/ja_UTF/wp-content/plugins/xpressme/language (added)
-
external/xpress_i18n/ja_UTF/wp-content/plugins/xpressme/language/xpressme-ja_UTF.mo (added)
-
external/xpress_i18n/ja_UTF/wp-content/plugins/xpressme/language/xpressme-ja_UTF.po (added)
-
external/xpress_i18n/ja_UTF/wp-content/themes (added)
-
external/xpress_i18n/ja_UTF/wp-content/themes/xpress_default (added)
-
external/xpress_i18n/ja_UTF/wp-content/themes/xpress_default/ja_UTF.mo (added)
-
external/xpress_i18n/ja_UTF/wp-content/themes/xpress_default/ja_UTF.po (added)
-
xpressme_integration_kit/class/config_from_xoops.class.php (modified) (4 diffs)
-
xpressme_integration_kit/include/old_template-loader.php (added)
-
xpressme_integration_kit/include/oninstall.php (modified) (3 diffs)
-
xpressme_integration_kit/include/onupdate.php (modified) (2 diffs)
-
xpressme_integration_kit/wp-config.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (modified) (4 diffs)
-
xpressme_integration_kit/wp-content/plugins/xpressme/include/functions_for_wp20.php (added)
-
xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php (modified) (4 diffs)
-
xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php (modified) (2 diffs)
-
xpressme_integration_kit/wp-content/themes/xpress_default/blocks/category_block_theme.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/themes/xpress_default/comments.php (modified) (4 diffs)
-
xpressme_integration_kit/wp-content/themes/xpress_default/index.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/themes/xpress_default/searchform.php (modified) (1 diff)
-
xpressme_integration_kit/wp-content/themes/xpress_default/single.php (modified) (2 diffs)
-
xpressme_integration_kit/xoops_version.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/xpressme_integration_kit/class/config_from_xoops.class.php
r232 r252 38 38 var $mu_domain_current_site; 39 39 var $mu_path_current_site; 40 40 var $wp_db_version; 41 var $is_wp20; 41 42 42 43 function __constructor() //for PHP5 … … 163 164 164 165 $this->set_module_version(); 165 $this->set_ is_wpmu();166 $this->set_wp_version(); 166 167 $this->set_mu_current_site(); 167 168 } … … 194 195 } 195 196 196 function set_ is_wpmu(){197 function set_wp_version(){ 197 198 include dirname(dirname(__FILE__)) . '/wp-includes/version.php'; 198 199 … … 201 202 else 202 203 $this->is_wpmu = true; 204 205 $this->wp_db_version = $wp_db_version; 206 if ($wp_db_version == 3441) 207 $this->is_wp20 = true; 208 else 209 $this->is_wp20 = false; 210 203 211 } 204 212 -
trunk/xpressme_integration_kit/include/oninstall.php
r232 r252 126 126 $pass_md5 = is_object($GLOBALS["xoopsUser"])?$GLOBALS["xoopsUser"]->getVar("pass"):''; 127 127 128 if (!function_exists('username_exists')){ 129 require_once($mydirpath . '/wp-includes/registration-functions.php'); 130 } 128 131 $user_id = username_exists($user_name); 129 132 if ( !$user_id ) { … … 150 153 if (!$xoops_config->is_wpmu){ // for WordPress 151 154 // make WordPress Default data 152 wp_install_defaults($user_id); 155 if (function_exists('wp_install_defaults')){ 156 wp_install_defaults($user_id); 157 } else { 158 wp_install_old_defaults($user_id); 159 } 160 153 161 $ret[] = 'The first sample post & comment was written.'; 154 162 … … 210 218 endif; 211 219 220 if( ! function_exists( 'wp_install_old_defaults' ) ) : 221 function wp_install_old_defaults($user_id) { 222 global $wpdb; 223 224 // Now drop in some default links 225 $wpdb->query("INSERT INTO $wpdb->linkcategories (cat_id, cat_name) VALUES (1, '".$wpdb->escape(__('Blogroll'))."')"); 226 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://blogs.linux.ie/xeer/', 'Donncha', 1, 'http://blogs.linux.ie/xeer/feed/', '');"); 227 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zengun.org/weblog/', 'Michel', 1, 'http://zengun.org/weblog/feed/', '');"); 228 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://boren.nu/', 'Ryan', 1, 'http://boren.nu/feed/', '');"); 229 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://photomatt.net/', 'Matt', 1, 'http://xml.photomatt.net/feed/', '');"); 230 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://zed1.com/journalized/', 'Mike', 1, 'http://zed1.com/journalized/feed/', '');"); 231 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://www.alexking.org/', 'Alex', 1, 'http://www.alexking.org/blog/wp-rss2.php', '');"); 232 $wpdb->query("INSERT INTO $wpdb->links (link_url, link_name, link_category, link_rss, link_notes) VALUES ('http://dougal.gunters.org/', 'Dougal', 1, 'http://dougal.gunters.org/feed/', '');"); 233 234 // Default category 235 $wpdb->query("INSERT INTO $wpdb->categories (cat_ID, cat_name, category_nicename, category_count, category_description) VALUES ('0', '".$wpdb->escape(__('Uncategorized'))."', '".sanitize_title(__('Uncategorized'))."', '1', '')"); 236 237 // First post 238 $now = date('Y-m-d H:i:s'); 239 $now_gmt = gmdate('Y-m-d H:i:s'); 240 $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, comment_count, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('Welcome to WordPress. This is your first post. Edit or delete it, then start blogging!'))."', '', '".$wpdb->escape(__('Hello world!'))."', '0', '".$wpdb->escape(__('hello-world'))."', '$now', '$now_gmt', '1', '', '', '')"); 241 242 $wpdb->query( "INSERT INTO $wpdb->post2cat (`rel_id`, `post_id`, `category_id`) VALUES (1, 1, 1)" ); 243 244 // Default comment 245 $wpdb->query("INSERT INTO $wpdb->comments (comment_post_ID, comment_author, comment_author_email, comment_author_url, comment_date, comment_date_gmt, comment_content) VALUES ('1', '".$wpdb->escape(__('Mr WordPress'))."', '', 'http://wordpress.org/', '$now', '$now_gmt', '".$wpdb->escape(__('Hi, this is a comment.<br />To delete a comment, just log in and view the post's comments. There you will have the option to edit or delete them.'))."')"); 246 247 // First Page 248 249 $wpdb->query("INSERT INTO $wpdb->posts (post_author, post_date, post_date_gmt, post_content, post_excerpt, post_title, post_category, post_name, post_modified, post_modified_gmt, post_status, to_ping, pinged, post_content_filtered) VALUES ('1', '$now', '$now_gmt', '".$wpdb->escape(__('This is an example of a WordPress page, you could edit this to put information about yourself or your site so readers know where you are coming from. You can create as many pages like this one or sub-pages as you like and manage all of your content inside of WordPress.'))."', '', '".$wpdb->escape(__('About'))."', '0', '".$wpdb->escape(__('about'))."', '$now', '$now_gmt', 'static', '', '', '')"); 250 } 251 endif; 252 212 253 ?> -
trunk/xpressme_integration_kit/include/onupdate.php
r247 r252 27 27 //XPressME Update 28 28 global $wpdb,$wp_rewrite, $wp_queries, $table_prefix, $wp_db_version, $wp_roles,$wp_query; 29 global $xoops_db; 29 30 define('WP_INSTALLING', true); 30 31 $mydirpath = XOOPS_ROOT_PATH . '/modules/' . $mydirname; … … 48 49 49 50 $site_url= XOOPS_URL."/modules/".$mydirname; 50 update_option("home",$site_url); // Site_url is set again.51 update_option(" siteurl", $site_url);51 xpress_put_siteurl($mydirname,$site_url); // Site_url is set again. 52 update_option("home", $site_url); 52 53 53 54 require_once($mydirpath . '/wp-admin/upgrade-functions.php'); -
trunk/xpressme_integration_kit/wp-config.php
r232 r252 111 111 } 112 112 113 ob_start(); 114 if($xoops_config->is_wp20 ) 115 require_once dirname( __FILE__ ).'/include/old_template-loader.php' ; 116 else 117 require_once( ABSPATH . WPINC . '/template-loader.php' ); 118 $wp_output = ob_get_contents(); 119 ob_end_clean(); 113 120 // It judges it here because it does in is_index_page() through feed to which the permalink is set. 114 121 if (is_wordpress_style() || is_feed()) { 115 require_once( ABSPATH . WPINC . '/template-loader.php' );122 echo $wp_output; 116 123 } else { 117 ob_start();118 require_once( ABSPATH . WPINC . '/template-loader.php' );119 $wp_output = ob_get_contents();120 ob_end_clean();121 124 require_once( ABSPATH .'/include/xpress_render.php' ); 122 125 xpress_render($wp_output); 123 126 } 124 125 127 126 128 //When there is no block cache, and an optional block is different, cache is refreshed. 127 129 //When adding, and changing and deleting Post & Comment, block cache is refreshed by add_action at any time. -
trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php
r245 r252 399 399 $blog_encoding = get_option('blog_charset'); 400 400 $text = get_the_content(''); 401 $text = strip_shortcodes( $text ); 401 if (function_exists('strip_shortcodes')){ //@since WP2.5 402 $text = strip_shortcodes( $text ); 403 } 402 404 $text = apply_filters('the_content', $text); 403 405 $text = str_replace(']]>', ']]>', $text); … … 454 456 function xpress_post_new_link($link_title = 'Post New',$display = true) 455 457 { 456 $output = '<a href="'. get_xpress_url() . '/wp-admin/post-new.php' . '">' . $link_title . '</a>'; 458 global $xoops_config; 459 460 if ($xoops_config->wp_db_version > 5000){ 461 $output = '<a href="'. get_xpress_url() . '/wp-admin/post-new.php' . '">' . $link_title . '</a>'; 462 } else { 463 $output = '<a href="'. get_xpress_url() . '/wp-admin/post.php' . '">' . $link_title . '</a>'; 464 } 457 465 if ($display) 458 466 echo $output; … … 469 477 if (is_category()) 470 478 $output = sprintf(__('Archive for the ‘%s’ Category', 'xpressme'), single_cat_title('', false)); 471 if (is_tag()) 472 $output = sprintf(__('Posts Tagged ‘%s’', 'xpressme'), single_tag_title('', false) ); 479 if (function_exists( 'is_tag' )){ 480 if (is_tag()) 481 $output = sprintf(__('Posts Tagged ‘%s’', 'xpressme'), single_tag_title('', false) ); 482 } 473 483 if (is_day()) 474 484 $output = sprintf(__('Archive for %s|Daily archive page', 'xpressme'), get_the_time(__('F jS, Y', 'xpressme'))); … … 587 597 588 598 function xpress_get_calendar($sun_color = '#DB0000' ,$sat_color = '#004D99' ,$initial = true) { 589 global $wpdb, $m, $monthnum, $year, $wp_locale, $posts; 590 591 599 global $wpdb, $m, $monthnum, $year, $wp_locale, $posts , $xoops_config; 600 601 if ($xoops_config->is_wp20){ 602 ob_start(); 603 get_calendar(true); 604 $output = ob_get_contents(); 605 ob_end_clean(); 606 $output = preg_replace('/<th abbr=/', '<th align="center" abbr=', $output); //week name align center 607 $output = preg_replace('/<td>/', '<td align="center">', $output); //days align center 608 $output = preg_replace('/<td id="today">/', '<td id="today" align="center">', $output); //today align center 609 610 return $output; 611 } 592 612 593 613 ob_start(); -
trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/pluggable-override.php
r232 r252 51 51 52 52 } else { 53 // WP 2.7original53 // WP original 54 54 if ( defined('XMLRPC_REQUEST') && XMLRPC_REQUEST ) 55 55 return false; … … 58 58 return; 59 59 60 if ( ! $user = wp_validate_auth_cookie() ) { 61 if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) { 62 wp_set_current_user(0); 63 return false; 64 } 65 } 66 67 wp_set_current_user($user); 60 if (function_exists('wp_validate_auth_cookie')){ 61 if ( ! $user = wp_validate_auth_cookie() ) { 62 if ( empty($_COOKIE[LOGGED_IN_COOKIE]) || !$user = wp_validate_auth_cookie($_COOKIE[LOGGED_IN_COOKIE], 'logged_in') ) { 63 wp_set_current_user(0); 64 return false; 65 } 66 } 67 wp_set_current_user($user); 68 } else { // for WP2.0 69 if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) || 70 !wp_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) { 71 wp_set_current_user(0); 72 return false; 73 } 74 $user_login = $_COOKIE[USER_COOKIE]; 75 wp_set_current_user(0, $user_login); 76 } 68 77 } 69 78 } … … 77 86 if(is_object($xoopsUser)){ 78 87 $u_name = $xoopsUser->getVar("uname"); 79 $u_pass_md5 = $xoopsUser->getVar("pass"); 88 $u_pass_md5 = $xoopsUser->getVar("pass"); 80 89 if ( ! empty($u_name) && ! empty($u_pass_md5) ) { 81 90 include_once dirname( __FILE__ ).'/user_sync_xoops.php'; … … 96 105 wp_set_current_user(0); 97 106 wp_clearcookie(); 98 return 0; 107 return 0; 99 108 } 100 109 endif; -
trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme.php
r236 r252 20 20 21 21 require_once dirname( __FILE__ ).'/include/pluggable-override.php' ; 22 if ($xoops_config->is_wp20) 23 require_once dirname( __FILE__ ).'/include/functions_for_wp20.php' ; 22 24 23 25 add_action('admin_menu', array(&$xpress_config, 'add_option_page')); -
trunk/xpressme_integration_kit/wp-content/plugins/xpressme/xpressme_class.php
r246 r252 410 410 411 411 } 412 412 413 413 function groupe_role_option(){ 414 414 global $wp_roles , $xoops_db; … … 427 427 428 428 $select_value = $groupe->role; 429 430 429 430 431 431 432 432 foreach($wp_roles->role_names as $role => $name) { -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/category_block_theme.php
r122 r252 17 17 $depth = !is_numeric( $options[12] ) ? 0 : $options[12] ; 18 18 19 $param = array( 20 'show_option_all' => $show_option_all, 21 'orderby' => $orderby, 22 'order' => $order, 23 'show_last_update' => $show_last_updated, 24 'style' => 'list', 25 'show_count' => $show_count, 26 'hide_empty' => $hide_empty, 27 'use_desc_for_title' => $use_desc_for_title, 28 'child_of' => 0, 29 'feed' => '', 30 'feed_image' => '', 31 'exclude' => $exclude, 32 'include' => $includes, 33 'hierarchical' => $hierarchical, 34 'title_li' => '', 35 'number' => '', 36 'echo' => 0, 37 'depth' => $depth 38 ); 39 $block['categories'] = wp_list_categories($param); 19 if (function_exists('wp_list_categories')){ 20 $param = array( 21 'show_option_all' => $show_option_all, 22 'orderby' => $orderby, 23 'order' => $order, 24 'show_last_update' => $show_last_updated, 25 'style' => 'list', 26 'show_count' => $show_count, 27 'hide_empty' => $hide_empty, 28 'use_desc_for_title' => $use_desc_for_title, 29 'child_of' => 0, 30 'feed' => '', 31 'feed_image' => '', 32 'exclude' => $exclude, 33 'include' => $includes, 34 'hierarchical' => $hierarchical, 35 'title_li' => '', 36 'number' => '', 37 'echo' => 0, 38 'depth' => $depth 39 ); 40 $block['categories'] = wp_list_categories($param); 41 } else { 42 if (empty($show_option_all)) 43 $optionall = 0; 44 else 45 $optionall = 1; 46 $param = array( 47 'optionall' => $optionall, 48 'all' => $show_option_all, 49 'sort_column' => $orderby, 50 'sort_order' => $order, 51 'show_last_update' => $show_last_updated, 52 'optioncount' => $show_count, 53 'hide_empty' => $hide_empty, 54 'use_desc_for_title' => $use_desc_for_title, 55 'child_of' => 0, 56 'feed' => '', 57 'feed_image' => '', 58 'exclude' => $exclude, 59 'hierarchical' => $hierarchical, 60 'recurse' => 1, 61 ); 62 $block['categories'] = wp_list_cats($param); 63 64 } 40 65 return $block ; 41 66 } -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/tag_cloud_block_theme.php
r122 r252 25 25 'include' => $wp_include 26 26 ); 27 ob_start(); 28 wp_tag_cloud($param); 29 $output = ob_get_contents(); 30 ob_end_clean(); 31 27 if (function_exists('wp_tag_cloud')) { 28 ob_start(); 29 wp_tag_cloud($param); 30 $output = ob_get_contents(); 31 ob_end_clean(); 32 } else { 33 $output = 'not function wp_tag_cloud()'; 34 } 32 35 $block['tag_cloud'] = $output; 33 36 return $block ; -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/widget_block_theme.php
r136 r252 38 38 } 39 39 } 40 40 if (!function_exists('wp_get_sidebars_widgets')) { 41 echo 'Not support sidebar widget'; 42 return; 43 } 41 44 $sidebars_widgets = wp_get_sidebars_widgets(); 42 45 $registered_sidebars = $wp_registered_sidebars[$index]; -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/comments.php
r232 r252 8 8 return; 9 9 } 10 11 if (function_exists('have_comments')) 12 $have_comments= have_comments(); 13 else 14 $have_comments= $comments; 15 10 16 ?> 11 17 12 18 <!-- You can start editing here. --> 13 14 <?php if ( have_comments() ) : ?> 19 <?php if ( $have_comments ) : ?> 15 20 <?php if ( ! empty($comments_by_type['comment']) ) : ?> 16 21 <h3 id="xpress_comments"><?php comments_number(__('No Responses', 'xpress'), __('One Response', 'xpress'), __('% Responses', 'xpress'));?> <?php printf(__('to “%s”', 'xpress'), the_title('', '', false)); ?></h3> 17 22 <div id="xpress_commentlist"> 18 <?php wp_list_comments('type=comment&style=div'); ?> 23 <?php if (function_exists('wp_list_comments')) : ?> 24 <?php wp_list_comments('type=comment&style=div'); ?> 25 <ol class="commentlist"> 26 <?php else : ?> 27 <?php foreach ($comments as $comment) : ?> 28 <li <?php echo $oddcomment; ?>id="comment-<?php comment_ID() ?>"> 29 <?php if (function_exists('get_avatar')) echo get_avatar( $comment, 32 ); ?> 30 <?php printf(__('<cite>%s</cite> Says:', 'xpressme'), get_comment_author_link()); ?> 31 <?php if ($comment->comment_approved == '0') : ?> 32 <em><?php _e('Your comment is awaiting moderation.', 'xpressme'); ?></em> 33 <?php endif; ?> 34 <br /> 35 <small class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php printf(__('%1$s at %2$s', 'xpressme'), get_comment_date(__('F jS, Y', 'xpressme')), get_comment_time()); ?></a> <?php edit_comment_link(__('Comment Edit', 'xpressme'),' ',''); ?></small> 36 <?php comment_text() ?> 37 </li> 38 <?php 39 /* Changes every other comment to a different class */ 40 $oddcomment = ( empty( $oddcomment ) ) ? 'class="alt" ' : ''; 41 ?> 42 <?php endforeach; /* end for each comment */ ?> 43 </ol> 44 <?php endif; ?> 19 45 </div> 20 46 <?php endif; ?> 21 22 <div class="navigation"> 23 <div class="alignleft"><?php previous_comments_link() ?></div> 24 <div class="alignright"><?php next_comments_link() ?></div> 25 </div> 47 <?php if (function_exists('wp_list_comments')) : ?> 48 <div class="navigation"> 49 <div class="alignleft"><?php previous_comments_link() ?></div> 50 <div class="alignright"><?php next_comments_link() ?></div> 51 </div> 52 <?php endif; ?> 53 26 54 <?php else : // this is displayed if there are no comments so far ?> 27 55 … … 39 67 </div> 40 68 41 <div id="cancel-comment-reply"> 42 <small><?php cancel_comment_reply_link() ?></small> 43 </div> 69 <?php if ( function_exists('cancel_comment_reply_link') ): ?> 70 <div id="cancel-comment-reply"> 71 <small><?php cancel_comment_reply_link() ?></small> 72 </div> 73 <?php endif; ?> 44 74 45 75 <?php if ( get_option('comment_registration') && !$user_ID ) : ?> … … 49 79 <div id="xpress-comment-user"> 50 80 <?php if ( $user_ID ) : ?> 51 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out »', 'xpress'); ?></a></p> 81 <?php if ( function_exists('wp_logout_url') ): ?> 82 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out »', 'xpress'); ?></a></p> 83 <?php else : ?> 84 <p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?action=logout" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out »', 'xpress'); ?></a></p> 85 <?php endif; ?> 52 86 <?php else : ?> 53 87 <p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" <?php if ($req) echo "aria-required='true'"; ?> /> … … 69 103 <input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e('Submit Comment', 'xpress'); ?>" /> 70 104 </div> 71 <?php comment_id_fields(); ?> 105 <?php if (function_exists('comment_id_fields')) : ?> 106 <?php comment_id_fields(); //@since 2.7.0 ?> 107 <?php else : ?> 108 <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" /> 109 <?php endif; ?> 72 110 <?php do_action('comment_form', $post->ID); ?> 73 111 </div> -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/index.php
r165 r252 26 26 <?php if (function_exists('hotDates')) { hotDates(); }?> 27 27 <div class ="xpress-post-title"> 28 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2> 28 <?php if(function_exists('the_title_attribute')) : ?> 29 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2> 30 <?php else : ?> 31 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title('','',false)); ?>"><?php the_title(); ?></a></h2> 32 <?php endif; ?> 29 33 </div> 30 34 </div> -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/searchform.php
r96 r252 1 1 <form method="get" id="searchform" action="<?php bloginfo('url'); ?>/"> 2 2 <label class="hidden" for="s"><?php _e('Search for:', 'xpress'); ?></label> 3 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" /> 3 <?php if(function_exists('the_search_query')) : ?> 4 <div><input type="text" value="<?php the_search_query(); ?>" name="s" id="s" /> 5 <?php else : ?> 6 <div><input type="text" value="<?php echo attribute_escape($s); ?>" name="s" id="s" /> 7 <?php endif; ?> 4 8 <input type="submit" id="searchsubmit" value="<?php _e('Search', 'xpress'); ?>" /> 5 9 </div> -
trunk/xpressme_integration_kit/wp-content/themes/xpress_default/single.php
r232 r252 21 21 <?php if (function_exists('hotDates')) { hotDates(); }?> 22 22 <div class ="xpress-post-title"> 23 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2> 23 <?php if(function_exists('the_title_attribute')) : ?> 24 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2> 25 <?php else : ?> 26 <h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title('','',false)); ?>"><?php the_title(); ?></a></h2> 27 <?php endif; ?> 24 28 </div> 25 29 </div> … … 61 65 62 66 <div id ="xpress-comments-block"> 63 <?php comments_template( '', true); ?>67 <?php comments_template(); ?> 64 68 </div> 65 69 </div> -
trunk/xpressme_integration_kit/xoops_version.php
r249 r252 31 31 $modversion['name'] = ucfirst($mydirname) . ' ' . constant('_MI_XP2_NAME') ; 32 32 $modversion['description'] = constant( '_MI_XP2_DESC'); 33 $modversion['version'] = "2. 00";33 $modversion['version'] = "2.10"; 34 34 $modversion['credits'] = "Wordpress DEV (http://wordpress.org/) XPressME DEV Toemon) (http://ja.xpressme.info) ;"; 35 35 $modversion['author'] = "toemon (http://ja.xpressme.info)"; … … 40 40 41 41 // status 42 $modversion['codename'] = " ";42 $modversion['codename'] = "Bata-1"; 43 43 44 44 // onInstall, onUpdate, onUninstall … … 81 81 if (@$current_user->user_level > 0) { 82 82 $modversion['sub'][1]['name'] = constant( '_MI_XP2_MENU_POST_NEW'); 83 $modversion['sub'][1]['url'] = "wp-admin/post-new.php"; 83 if ($wp_db_version > 5000) 84 $modversion['sub'][1]['url'] = "wp-admin/post-new.php"; 85 else 86 $modversion['sub'][1]['url'] = "wp-admin/post.php"; 84 87 $modversion['sub'][2]['name'] = constant( '_MI_XP2_MENU_EDIT'); 85 88 $modversion['sub'][2]['url'] = "wp-admin/edit.php";
Note: See TracChangeset
for help on using the changeset viewer.
