10h30/trestle
1
0
Fork 0
mirror of https://github.com/10h30/trestle.git synced 2026-07-13 19:56:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge conflict causing PHP error.

Browse Source
This commit is contained in:
MickeyKay
2015-03-23 12:19:09 -07:00
parent 58a3cd2f26
commit 8890f6e413
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
includes/functions/theme-functions.php
+1 -5
View File
@@ -462,11 +462,7 @@ function trestle_read_more_link( $default_text ) {
// Get Trestle custom "read more" link text
$custom_text = esc_attr( genesis_get_option( 'trestle_read_more_text' ) );
<<<<<<< HEAD
if ( $custom_text ) {
=======
if ( $custom_text )
>>>>>>> 9de3310f116bb4f7dd5323ca40b16f2fe4160dcd
if ( $custom_text ) {
return '&hellip;&nbsp;<a class="more-link" title="' . $custom_text . '" href="' . get_permalink() . '">' . $custom_text . '</a>';
} else {
return $default_text;