Changeset 274

Timestamp:

Jun 10, 2009, 5:51:40 PM (16 years ago)

Author:

toemon

Message:

#130 カスタムテンプレートタグでwp_parse_argsを利用 get_xpress_excerpt_contents()はサブ関数としてxpress_the_content()にパラメータを追加して全てをまかなうように変更

Location:

trunk

Files:

• external/for_wordpress_mu/src/wp-content/themes/xpress_mu_home/index.php (modified) (1 diff)
• xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php (modified) (2 diffs)
• xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php (modified) (1 diff)
• xpressme_integration_kit/wp-content/themes/xpress_default/index.php (modified) (1 diff)

trunk/external/for_wordpress_mu/src/wp-content/themes/xpress_mu_home/index.php

@@ -30 +30 @@
                                         </div>
                                         <div class="xpress-post-entry">
-                                                <?php xpress_the_content(__('Read the rest of this entry &raquo;', 'xpress') ); ?>
+                                                <?php xpress_the_content('more_link_text=' . __('Read the rest of this entry &raquo;', 'xpress') ); ?>
                                         </div>
                                         <div class="xpress-link-pages"><?php wp_link_pages() ?></div>

trunk/xpressme_integration_kit/wp-content/plugins/xpressme/include/custom_functions.php

@@ -519 +519 @@
 }
 
-function xpress_the_content($more_link_text = null, $stripteaser = 0, $more_file = '',$show = true)
+function xpress_the_content($args ='')
 {
         global $post,$xpress_config;
         
-        
-        if ($xpress_config->is_content_excerpt){
-                $excerpt_length_word = $xpress_config->excerpt_length_word;
-                $excerpt_length_character = $xpress_config->excerpt_length_character;
-                $more_link_text = $xpress_config->more_link_text;
-                $content = get_xpress_excerpt_contents($excerpt_length_word,$excerpt_length_character,$more_link_text);
+        $defaults = array(
+                'more_link_text'=> null,
+                'stripteaser' => 0,
+                'more_file' => '',
+                'configration_select' => 1,
+                'do_excerpt' => 0,
+                'excerpt_length_word' => $xpress_config->excerpt_length_word ,
+                'excerpt_length_character' => $xpress_config->excerpt_length_character ,
+                'excerpt_more_link_text' => $xpress_config->more_link_text ,
+                'echo' => 1
+        );
+        $r = wp_parse_args( $args, $defaults );
+
+        extract( $r );
+        
+        if ($configration_select){
+                if ($xpress_config->is_content_excerpt)
+                        $do_excerpt = 1;
+                else
+                        $do_excerpt = 0;
+        }
+        
+        if ($do_excerpt){
+                $content = get_xpress_excerpt_contents($excerpt_length_word,$excerpt_length_character,$excerpt_more_link_text);
         } else {
                 $content = get_the_content($more_link_text,$stripteaser,$more_file);
@@ -534 +552 @@
                 $content = str_replace(']]>', ']]>', $content);
         }       
-        if(empty($show)) return $content;
-        echo $content;
+        if ($echo)
+                echo $content;
+        else
+                return $content;
 }
 

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/blocks/recent_posts_content_block_theme.php

@@ -71 +71 @@
                         }
 
-                        if ($excerpt){
-                                $excerpt_length_word = $excerpt_size;
-                                $excerpt_length_character = $excerpt_size;
-                                $more_link_text = '';
-                                $post_content = get_xpress_excerpt_contents($excerpt_length_word,$excerpt_length_character,$more_link_text);
-                        } else {
-                                $post_content = get_the_content(__('more'),0,'',false); 
-                                $post_content = apply_filters('the_content', $post_content);
-                                $post_content = str_replace(']]>', ']]>', $post_content);
-                        }
+                        $param = array(
+                                'configration_select' => 0, 
+                                'do_excerpt' => $excerpt,
+                                'excerpt_length_word' => $excerpt_size, 
+                                'excerpt_length_character' => $excerpt_size, 
+                                'echo' => 0
+                        );
 
+                        $post_content = xpress_the_content($param);
+                        
                         ob_start();
                                 the_modified_date($date_format);

trunk/xpressme_integration_kit/wp-content/themes/xpress_default/index.php

@@ -34 +34 @@
                                         </div>
                                         <div class="xpress-post-entry">
-                                                <?php xpress_the_content(__('Read the rest of this entry &raquo;', 'xpress') ); ?>
+                                                <?php xpress_the_content('more_link_text=' . __('Read the rest of this entry &raquo;', 'xpress') ); ?>
                                         </div>
                                         <div class="xpress-link-pages"><?php wp_link_pages() ?></div>