Syncing with dev branch

This commit is contained in:
Braad
2015-04-21 12:05:22 -07:00
parent 9de3310f11
commit 6d34078f94
24 changed files with 4150 additions and 162 deletions
+2 -2
View File
@@ -102,7 +102,7 @@ function trestle_date( $atts ) {
return date( $format );
}
add_shortcode( 'blockquote', 'igg_blockquote_shortcode' );
add_shortcode( 'blockquote', 'trestle_blockquote_shortcode' );
/**
* Blockquote
*
@@ -114,7 +114,7 @@ add_shortcode( 'blockquote', 'igg_blockquote_shortcode' );
*
* @return string Shortcode output.
*/
function igg_blockquote_shortcode( $atts, $content = null ) {
function trestle_blockquote_shortcode( $atts, $content = null ) {
$atts = shortcode_atts( array(
'citation' => '',