Clean urls
git-svn-id: http://svn.automattic.com/wordpress/trunk@10811 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
e8b6fe7347
commit
18c63b62aa
|
@ -186,7 +186,7 @@ class LJ_API_Import {
|
||||||
<p class="submit">
|
<p class="submit">
|
||||||
<input type="submit" class="button-primary" value="<?php echo attribute_escape( __( 'Continue previous import' ) ) ?>" />
|
<input type="submit" class="button-primary" value="<?php echo attribute_escape( __( 'Continue previous import' ) ) ?>" />
|
||||||
</p>
|
</p>
|
||||||
<p class="submitbox"><a href="<?php echo $_SERVER['PHP_SELF'] . '?import=livejournal&step=-1&_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&_wp_http_referer=' . attribute_escape( $_SERVER['REQUEST_URI'] ) ?>" class="deletion submitdelete"><?php _e( 'Cancel & start a new import' ) ?></a></p>
|
<p class="submitbox"><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&step=-1&_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&_wp_http_referer=' . attribute_escape( $_SERVER['REQUEST_URI'] )) ?>" class="deletion submitdelete"><?php _e( 'Cancel & start a new import' ) ?></a></p>
|
||||||
<p>
|
<p>
|
||||||
<?php else : ?>
|
<?php else : ?>
|
||||||
<input type="hidden" name="step" value="1" />
|
<input type="hidden" name="step" value="1" />
|
||||||
|
@ -724,7 +724,7 @@ class LJ_API_Import {
|
||||||
if ( empty( $this->username ) || empty( $this->password ) ) {
|
if ( empty( $this->username ) || empty( $this->password ) ) {
|
||||||
?>
|
?>
|
||||||
<p><?php _e( 'Please enter your LiveJournal username <em>and</em> password so we can download your posts and comments.' ) ?></p>
|
<p><?php _e( 'Please enter your LiveJournal username <em>and</em> password so we can download your posts and comments.' ) ?></p>
|
||||||
<p><a href="<?php echo $_SERVER['PHP_SELF'] . '?import=livejournal&step=-1&_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&_wp_http_referer=' . attribute_escape( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
|
<p><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&step=-1&_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&_wp_http_referer=' . attribute_escape( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
|
||||||
<?php
|
<?php
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -736,7 +736,7 @@ class LJ_API_Import {
|
||||||
delete_option( 'ljapi_protected_password' );
|
delete_option( 'ljapi_protected_password' );
|
||||||
?>
|
?>
|
||||||
<p><?php _e( 'Logging in to LiveJournal failed. Check your username and password and try again.' ) ?></p>
|
<p><?php _e( 'Logging in to LiveJournal failed. Check your username and password and try again.' ) ?></p>
|
||||||
<p><a href="<?php echo $_SERVER['PHP_SELF'] . '?import=livejournal&step=-1&_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&_wp_http_referer=' . attribute_escape( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
|
<p><a href="<?php echo clean_url($_SERVER['PHP_SELF'] . '?import=livejournal&step=-1&_wpnonce=' . wp_create_nonce( 'lj-api-import' ) . '&_wp_http_referer=' . attribute_escape( str_replace( '&step=1', '', $_SERVER['REQUEST_URI'] ) ) ) ?>"><?php _e( 'Start again' ) ?></a></p>
|
||||||
<?php
|
<?php
|
||||||
return false;
|
return false;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue