Changeset 24886
- Timestamp:
- 07/29/2013 07:48:46 PM (11 years ago)
- Location:
- branches/3.6
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.6
- Property svn:mergeinfo changed
/trunk merged: 24883-24884
- Property svn:mergeinfo changed
-
branches/3.6/wp-admin/includes/post.php
r24879 r24886 1208 1208 return; 1209 1209 1210 if ( ( $user_id = wp_check_post_lock( $post->ID ) ) && ( $user = get_userdata( $user_id ) ) ) { 1211 $locked = apply_filters( 'show_post_locked_dialog', true, $post, $user ); 1210 $user = null; 1211 if ( $user_id = wp_check_post_lock( $post->ID ) ) 1212 $user = get_userdata( $user_id ); 1213 1214 if ( $user ) { 1215 if ( ! apply_filters( 'show_post_locked_dialog', true, $post, $user ) ) 1216 return; 1217 1218 $locked = true; 1212 1219 } else { 1213 1220 $locked = false; … … 1256 1263 <div class="post-locked-avatar"><?php echo get_avatar( $user->ID, 64 ); ?></div> 1257 1264 <p class="currently-editing wp-tab-first" tabindex="0"><?php echo esc_html( sprintf( __( 'This content is currently locked. If you take over, %s will be blocked from continuing to edit.' ), $user->display_name ) ); ?></p> 1258 <?php do_action( 'post_lock _text', $post ); ?>1265 <?php do_action( 'post_locked_dialog', $post ); ?> 1259 1266 <p> 1260 1267 <a class="button" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a> … … 1284 1291 <span class="locked-saved hidden"><?php _e('Your latest changes were saved as a revision.'); ?></span> 1285 1292 </p> 1286 <?php do_action( 'post_lock_ text', $post ); ?>1293 <?php do_action( 'post_lock_lost_dialog', $post ); ?> 1287 1294 <p><a class="button button-primary wp-tab-last" href="<?php echo esc_url( $sendback ); ?>"><?php echo $sendback_text; ?></a></p> 1288 1295 </div>
Note: See TracChangeset
for help on using the changeset viewer.