Merge remote-tracking branch 'origin/master' into fix-canvas-vuln-20180718

This commit is contained in:
copernicus-mogley 2018-07-18 16:30:02 +02:00
commit 0525475925
4 changed files with 9 additions and 25 deletions

View File

@ -39,7 +39,7 @@ About </li>
<li class="menu-title">
Technology </li>
<li><a href="https://z.cash/download.html">Download Zcash</a></li>
<li><a href="https://github.com/zcash/zcash/wiki/1.0-User-Guide">1.0 User Guide</a></li>
<li><a href="https://zcash.readthedocs.io/en/latest/rtd_pages/rtd_docs/user_guide.html">User Guide</a></li>
<li><a href="https://github.com/zcash/zcash">GitHub</a></li>
<li><a href="https://github.com/zcash/zcash/issues">Report a bug</a></li>
<li><a href="https://z.cash/technology/paramgen.html">Paramgen</a></li>

View File

@ -28,17 +28,20 @@ if ( ! function_exists( 'twentyseventeen_posted_on' ) ) :
* Integrate Co-Authors Plus with TwentySeventeen by replacing twentyseventeen_posted_on() with this function
*/
function twentyseventeen_posted_on() {
$postName = get_post_field( 'post_name', get_post() );
$pubDate = get_the_date();
$modDate = get_the_modified_date();
$gitDate = get_the_date('Y-m-d');
$gitLink = 'https://github.com/zcash/zcash-blog/blob/master/_posts/' . $gitDate . '-' . $postName . '.md';
if ($modDate > $pubDate) {
$postDates = '<span class="entry-date">'.$pubDate.' &bull; Updated: '.$modDate.'</span>';
$postDates = '<span class="entry-date"><span class="pub-date">'.$pubDate.'</span> &bull; <span class="update-date">Updated: '.$modDate.'</span></span>';
} else {
$postDates = '<span class="entry-date">'.$pubDate.'</span>';
}
if ( function_exists( 'coauthors_posts_links' ) ) :
printf( __( '%3$s <span class="meta-sep">|</span> %2$s', 'twentyseventeen' ),
'meta-prep meta-prep-author',
sprintf( '<a href="%1$s" title="%2$s" rel="bookmark" class="posted-on">%3$s</a>',
sprintf( '<a href="'.$gitLink.'" title="%2$s" rel="bookmark" class="posted-on">%3$s</a>',
get_permalink(),
esc_attr( get_the_time() ),
$postDates

View File

@ -1,25 +1,6 @@
<?php
$langs = ["ru","fr","zh","pt","ko_KR","ja","es"];
$pathArray = explode('/', $_SERVER[REQUEST_URI]);
// Redirect non-english posts for translation
if (is_single()){
$pubDate = get_the_date(U);
if ( (in_array($pathArray[1], $langs)) && ($pubDate <= 1489363200 ) ) { // Published on or before 2017-03-13
$redirectLang = strtolower($pathArray[1]);
if ($redirectLang === 'pt') {
$redirectLang = 'pt_br';
}
$origURL = 'https://z.cash/'.$redirectLang.'/blog/'.$pathArray[2].'.html';
echo '<a href="'.$origPost.'" target="_blank">'.$origPost.'</a>';
function Redirect($url, $permanent = false) {
if (headers_sent() === false) {
header('Location: ' . $url, true, ($permanent === true) ? 301 : 302);
}
exit();
}
Redirect($origURL);
}
}
?><!DOCTYPE html>
<html <?php language_attributes(); ?> class="no-js no-svg">
<head>
@ -76,7 +57,7 @@ if (is_single()){
<li><a href="<?php echo '/es' . $pageslug ?>">Español</a></li>
</ul>
</div>
</header><!-- #masthead -->
<div class="site-content-contain">
<div id="content" class="site-content">

View File

@ -28,8 +28,8 @@ get_header(); ?>
endif;
the_post_navigation( array(
'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span>%title</span>',
'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title">%title<span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
'prev_text' => '<span class="screen-reader-text">' . __( 'Previous Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Previous', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-left' ) ) . '</span><span class="nav-title-text">%title</span></span>',
'next_text' => '<span class="screen-reader-text">' . __( 'Next Post', 'twentyseventeen' ) . '</span><span aria-hidden="true" class="nav-subtitle">' . __( 'Next', 'twentyseventeen' ) . '</span> <span class="nav-title"><span class="nav-title-text">%title</span><span class="nav-title-icon-wrapper">' . twentyseventeen_get_svg( array( 'icon' => 'arrow-right' ) ) . '</span></span>',
) );
endwhile; // End of the loop.