Skip to content

Commit

Permalink
Merge pull request #978 from OpenDevelopmentMekong/master
Browse files Browse the repository at this point in the history
merging to prod for releasing v2.2.42
  • Loading branch information
Alex Corbi authored May 31, 2017
2 parents 044ad7b + f7abd19 commit f109755
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions inc/utils/content.php
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ function walk_child_category_by_post_type( $children, $post_type, $current_cat =
/** END CATEGORY */

/**** Post Meta ******/
function echo_post_meta($the_post, $show_elements, $order = 'created')
function echo_post_meta($the_post, $show_elements = array('date','categories','tags'), $order = 'created')
{
global $post;
$post = $the_post;
Expand Down Expand Up @@ -314,7 +314,7 @@ function echo_post_meta($the_post, $show_elements, $order = 'created')
if (odm_language_manager()->get_current_language() == 'km') {
echo convert_date_to_kh_date(get_the_modified_time('j.M.Y'));
} else {
echo get_the_modified_time('j F Y');
echo get_the_modified_time('Y-m-d');
}
?>
<?php else: ?>
Expand All @@ -323,7 +323,7 @@ function echo_post_meta($the_post, $show_elements, $order = 'created')
if (odm_language_manager()->get_current_language() == 'km') {
echo convert_date_to_kh_date(get_the_time('j.M.Y'));
} else {
echo get_the_time('j F Y');
echo get_the_time('Y-m-d');
}
?>
<?php endif; ?>
Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Author: Open Development Mekong
Author URI: http://github.com/OpenDevelopmentMekong
Description: Open Development Mekong's wordpress theme. Based on JEO child theme
Template: jeo
Version: 2.2.41
Version: 2.2.42
License: GNU General Public License v3 or later
License URI: http://www.gnu.org/licenses/gpl-3.0.html
*/
Expand Down

0 comments on commit f109755

Please sign in to comment.