<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][11839] trunk/src: Templates: swap shared `_attachments/avatars/index.php` with Legacy version; fix path in wp-admin.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/11839">11839</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/11839","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>djpaul</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-01 22:26:00 +0000 (Thu, 01 Feb 2018)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Templates: swap shared `_attachments/avatars/index.php` with Legacy version; fix path in wp-admin.
The Nouveau template was previously used, and included a call to a Nouveau-only function, which I missed in <a href="http://buddypress.trac.wordpress.org/changeset/11835">r11835</a>.
The Nouveau pack now has a copy of its Nouveau template again.
Also changes a patch in `bp_attachments_get_template_part()` to support the changed location for this template asset.
This is used for the "Upload Avatar" screens in wp-admin Users > Edit.
Props boonebgorges, hnla.
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/7679">#7679</a> and <a href="http://buddypress.trac.wordpress.org/ticket/7675">#7675</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreattachmentsphp">trunk/src/bp-core/bp-core-attachments.php</a></li>
<li><a href="#trunksrcbptemplatessharedbuddypressassets_attachmentsavatarsindexphp">trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/src/bp-templates/bp-nouveau/buddypress/assets/</li>
<li>trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/</li>
<li>trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/</li>
<li><a href="#trunksrcbptemplatesbpnouveaubuddypressassets_attachmentsavatarsindexphp">trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbplegacybuddypressassets_attachmentsavatarsindexphp">trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreattachmentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/bp-core-attachments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/bp-core-attachments.php 2018-02-01 20:10:42 UTC (rev 11838)
+++ trunk/src/bp-core/bp-core-attachments.php 2018-02-01 22:26:00 UTC (rev 11839)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -925,7 +925,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Load the attachment template in WP Administration screens.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_admin() && ( ! defined( 'DOING_AJAX' ) || ! DOING_AJAX ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $attachment_admin_template_part = buddypress()->themes_dir . '/bp-legacy/buddypress/' . $attachment_template_part . '.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $attachment_admin_template_part = buddypress()->themes_dir . '/shared/buddypress/' . $attachment_template_part . '.php';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Check whether the template part exists.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! file_exists( $attachment_admin_template_part ) ) {
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressassets_attachmentsavatarsindexphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php 2018-02-01 20:10:42 UTC (rev 11838)
+++ trunk/src/bp-templates/bp-legacy/buddypress/assets/_attachments/avatars/index.php 2018-02-01 22:26:00 UTC (rev 11839)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,47 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-/**
- * BuddyPress Avatars main template.
- *
- * This template is used to inject the BuddyPress Backbone views
- * dealing with avatars.
- *
- * It's also used to create the common Backbone views.
- *
- * @since 2.3.0
- *
- * @package BuddyPress
- * @subpackage bp-attachments
- */
-
-/**
- * This action is for internal use, please do not use it
- */
-do_action( 'bp_attachments_avatar_check_template' );
-?>
-<div class="bp-avatar-nav"></div>
-<div class="bp-avatar"></div>
-<div class="bp-avatar-status"></div>
-
-<script type="text/html" id="tmpl-bp-avatar-nav">
- <a href="{{data.href}}" class="bp-avatar-nav-item" data-nav="{{data.id}}">{{data.name}}</a>
-</script>
-
-<?php bp_attachments_get_template_part( 'uploader' ); ?>
-
-<?php bp_attachments_get_template_part( 'avatars/crop' ); ?>
-
-<?php bp_attachments_get_template_part( 'avatars/camera' ); ?>
-
-<script id="tmpl-bp-avatar-delete" type="text/html">
- <# if ( 'user' === data.object ) { #>
- <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
- <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
- <# } else if ( 'group' === data.object ) { #>
- <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
- <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></a></p>
- <# } else { #>
- <?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
- <# } #>
-</script>
-
-<?php do_action( 'bp_attachments_avatar_main_template' );
</del></span></pre></div>
<a id="trunksrcbptemplatesbpnouveaubuddypressassets_attachmentsavatarsindexphpfromrev11838trunksrcbptemplatessharedbuddypressassets_attachmentsavatarsindexphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php (from rev 11838, trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php)</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php (rev 0)
+++ trunk/src/bp-templates/bp-nouveau/buddypress/assets/_attachments/avatars/index.php 2018-02-01 22:26:00 UTC (rev 11839)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,44 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * BuddyPress Avatars main template.
+ *
+ * This template is used to inject the BuddyPress Backbone views
+ * dealing with avatars.
+ *
+ * It's also used to create the common Backbone views.
+ *
+ * @since 2.3.0
+ */
+
+/**
+ * This action is for internal use, please do not use it
+ */
+do_action( 'bp_attachments_avatar_check_template' );
+?>
+<div class="bp-avatar-nav"></div>
+<div class="bp-avatar"></div>
+<div class="bp-avatar-status"></div>
+
+<script type="text/html" id="tmpl-bp-avatar-nav">
+ <a href="{{data.href}}" class="bp-avatar-nav-item" data-nav="{{data.id}}">{{data.name}}</a>
+</script>
+
+<?php bp_attachments_get_template_part( 'uploader' ); ?>
+
+<?php bp_attachments_get_template_part( 'avatars/crop' ); ?>
+
+<?php bp_attachments_get_template_part( 'avatars/camera' ); ?>
+
+<script id="tmpl-bp-avatar-delete" type="text/html">
+ <# if ( 'user' === data.object ) { #>
+ <p><?php esc_html_e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
+ <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button>
+ <# } else if ( 'group' === data.object ) { #>
+ <?php bp_nouveau_user_feedback( 'group-avatar-delete-info' ); ?>
+ <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></button>
+ <# } else { #>
+ <?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
+ <# } #>
+</script>
+
+<?php do_action( 'bp_attachments_avatar_main_template' ); ?>
</ins></span></pre></div>
<a id="trunksrcbptemplatessharedbuddypressassets_attachmentsavatarsindexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php 2018-02-01 20:10:42 UTC (rev 11838)
+++ trunk/src/bp-templates/shared/buddypress/assets/_attachments/avatars/index.php 2018-02-01 22:26:00 UTC (rev 11839)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -8,6 +8,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * It's also used to create the common Backbone views.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @package BuddyPress
+ * @subpackage bp-attachments
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,14 +34,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <script id="tmpl-bp-avatar-delete" type="text/html">
</span><span class="cx" style="display: block; padding: 0 10px"> <# if ( 'user' === data.object ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p><?php esc_html_e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
- <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( "If you'd like to delete your current profile photo but not upload a new one, please use the delete profile photo button.", 'buddypress' ); ?></p>
+ <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else if ( 'group' === data.object ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <?php bp_nouveau_user_feedback( 'group-avatar-delete-info' ); ?>
- <button type="button" class="button edit" id="bp-delete-avatar"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></button>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p><?php _e( "If you'd like to remove the existing group profile photo but not upload a new one, please use the delete group profile photo button.", 'buddypress' ); ?></p>
+ <p><a class="button edit" id="bp-delete-avatar" href="#"><?php esc_html_e( 'Delete Group Profile Photo', 'buddypress' ); ?></a></p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_action( 'bp_attachments_avatar_delete_template' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> </script>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php do_action( 'bp_attachments_avatar_main_template' ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php do_action( 'bp_attachments_avatar_main_template' );
</ins></span></pre>
</div>
</div>
</body>
</html>