Skip to content
This repository was archived by the owner on Dec 23, 2021. It is now read-only.

Commit

Permalink
ready for deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
@luiscape
luiscape committed Nov 5, 2014
1 parent 11d42cc commit 551deae
Show file tree
Hide file tree
Showing 658 changed files with 44,692 additions and 15,321 deletions.
2 changes: 1 addition & 1 deletion readme.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<body>
<h1 id="logo">
<a href="https://wordpress.org/"><img alt="WordPress" src="wp-admin/images/wordpress-logo.png" /></a>
<br /> Version 3.9.1
<br /> Version 4.0
</h1>
<p style="text-align: center">Semantic Personal Publishing Platform</p>

Expand Down
13 changes: 6 additions & 7 deletions wp-activate.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ function wpmu_activate_stylesheet() {
<?php } else {

$key = !empty($_GET['key']) ? $_GET['key'] : $_POST['key'];
$result = wpmu_activate_signup($key);
$result = wpmu_activate_signup( $key );
if ( is_wp_error($result) ) {
if ( 'already_active' == $result->get_error_code() || 'blog_taken' == $result->get_error_code() ) {
$signup = $result->get_error_data();
Expand All @@ -105,18 +105,17 @@ function wpmu_activate_stylesheet() {
echo '<p>'.$result->get_error_message().'</p>';
}
} else {
extract($result);
$url = get_blogaddress_by_id( (int) $blog_id);
$user = get_userdata( (int) $user_id);
$url = isset( $result['blog_id'] ) ? get_blogaddress_by_id( (int) $result['blog_id'] ) : '';
$user = get_userdata( (int) $result['user_id'] );
?>
<h2><?php _e('Your account is now active!'); ?></h2>

<div id="signup-welcome">
<p><span class="h3"><?php _e('Username:'); ?></span> <?php echo $user->user_login ?></p>
<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $password; ?></p>
<p><span class="h3"><?php _e('Password:'); ?></span> <?php echo $result['password']; ?></p>
</div>

<?php if ( $url != network_home_url('', 'http') ) : ?>
<?php if ( $url && $url != network_home_url( '', 'http' ) ) : ?>
<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">View your site</a> or <a href="%2$s">Log in</a>'), $url, $url . 'wp-login.php' ); ?></p>
<?php else: ?>
<p class="view"><?php printf( __('Your account is now activated. <a href="%1$s">Log in</a> or go back to the <a href="%2$s">homepage</a>.' ), network_site_url('wp-login.php', 'login'), network_home_url() ); ?></p>
Expand All @@ -129,4 +128,4 @@ function wpmu_activate_stylesheet() {
var key_input = document.getElementById('key');
key_input && key_input.focus();
</script>
<?php get_footer(); ?>
<?php get_footer();
257 changes: 85 additions & 172 deletions wp-admin/about.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@
require_once( dirname( __FILE__ ) . '/admin.php' );

wp_enqueue_style( 'wp-mediaelement' );
wp_enqueue_script( 'wp-playlist' );
add_action( 'admin_footer', 'wp_underscore_playlist_templates', 0 );
wp_enqueue_script( 'wp-mediaelement' );
wp_localize_script( 'mediaelement', '_wpmejsSettings', array(
'pluginPath' => includes_url( 'js/mediaelement/', 'relative' ),
'pauseOtherPlayers' => ''
) );

$title = __( 'About' );

Expand All @@ -24,7 +27,7 @@

<h1><?php printf( __( 'Welcome to WordPress&nbsp;%s' ), $display_version ); ?></h1>

<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s has lots of refinements we think you&#8217;ll love.' ), $display_version ); ?></div>
<div class="about-text"><?php printf( __( 'Thank you for updating! WordPress %s brings you a smoother writing and management experience.' ), $display_version ); ?></div>

<div class="wp-badge"><?php printf( __( 'Version %s' ), $display_version ); ?></div>

Expand All @@ -38,215 +41,125 @@
</a>
</h2>

<div class="changelog point-releases">
<h3><?php echo _n( 'Maintenance Release', 'Maintenance Releases', 1 ); ?></h3>
<p><?php printf( _n( '<strong>Version %1$s</strong> addressed %2$s bug.',
'<strong>Version %1$s</strong> addressed %2$s bugs.', 34 ), '3.9.1', number_format_i18n( 34 ) ); ?>
<?php printf( __( 'For more information, see <a href="%s">the release notes</a>.' ), 'http://codex.wordpress.org/Version_3.9.1' ); ?>
</p>
</div>

<div class="changelog">
<div class="about-overview">
<?php
if ( ! is_ssl() && ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>
<embed src="//v0.wordpress.com/player.swf?v=1.03" type="application/x-shockwave-flash" width="640" height="360" wmode="direct" seamlesstabbing="true" allowfullscreen="true" allowscriptaccess="always" overstretch="true" flashvars="guid=sAiXhCfV&amp;isDynamicSeeking=true" title=""></embed>
<?php else : ?>
<img class="about-overview-img" src="//s.w.org/images/core/3.9/overview.png?0" />
<?php endif; ?>
<?php if ( ( $locale = get_locale() ) && 'en_' === substr( $locale, 0, 3 ) ) : ?>
<embed src="//v.wordpress.com/bUdzKMro" type="application/x-shockwave-flash" width="640" height="360" allowscriptaccess="always" allowfullscreen="true" wmode="transparent"></embed>
<?php else : ?>
<img class="about-overview-img" src="//s.w.org/images/core/4.0/wp40.png" width="640" height="360" />
<?php endif; ?>
</div>
<h2 class="about-headline-callout"><?php _e( 'A smoother media editing&nbsp;experience' ); ?></h2>
<div class="feature-section col three-col">

<hr />

<div class="feature-section col two-col">
<div class="col-1">
<img src="//s.w.org/images/core/3.9/editor.jpg?0" />
<h4><?php _e( 'Improved visual editing' ); ?></h4>
<p><?php _e( 'The updated visual editor has improved speed, accessibility, and mobile support.' );
echo ' ' . __( 'You can paste into the visual editor from your word processor without wasting time to clean up messy styling. (Yeah, we&#8217;re talking about you, Microsoft Word.)' ); ?></p>
<h3><?php _e( 'Manage your media with style' ); ?></h3>
<p><?php _e( 'Explore your uploads in a beautiful, endless grid. A new details preview makes viewing and editing any amount of media in sequence a snap.' ); ?></p>
</div>
<div class="col-2">
<img src="//s.w.org/images/core/3.9/image.gif?0" />
<h4><?php _e( 'Edit images easily' ); ?></h4>
<p><?php _e( 'With quicker access to crop and rotation tools, it&#8217;s now much easier to edit your images while editing posts. You can also scale images directly in the editor to find just the right fit.' ); ?></p>
<div class="col-2 last-feature">
<img src="//s.w.org/images/core/4.0/media.jpg" />
</div>
<div class="col-3 last-feature">
<img src="//s.w.org/images/core/3.9/drop.jpg?0" />
<h4><?php _e( 'Drag and drop your images' ); ?></h4>
<p><?php _e( 'Uploading your images is easier than ever. Just grab them from your desktop and drop them onto the editor.' ); ?></p>
</div>

<hr />

<div class="feature-section col two-col">
<div class="col-1">
<div class="about-video about-video-embed">
<?php
echo wp_video_shortcode( array(
'mp4' => '//s.w.org/images/core/4.0/embed.mp4',
'ogv' => '//s.w.org/images/core/4.0/embed.ogv',
'webm' => '//s.w.org/images/core/4.0/embed.webm',
'loop' => true,
'autoplay' => true,
'width' => 500,
'height' => 352
) );
?>
</div>
</div>
<div class="col-2 last-feature">
<h3><?php _e( 'Working with embeds has never been easier' ); ?></h3>
<p><?php _e( 'Paste in a YouTube URL on a new line, and watch it magically become an embedded video. Now try it with a tweet. Oh yeah &#8212; embedding has become a visual experience. The editor shows a true preview of your embedded content, saving you time and giving you confidence.' ); ?></p>
<p><?php _e( 'We&#8217;ve expanded the services supported by default, too &#8212; you can embed videos from CollegeHumor, playlists from YouTube, and talks from TED. <a href="http://codex.wordpress.org/Embeds">Check out all of the embeds</a> that WordPress supports.' ); ?></p>
</div>
</div>

<hr>
<hr />

<div class="feature-section col two-col">
<div class="col-1">
<img src="//s.w.org/images/core/3.9/gallery.jpg?0" />
<h4><?php _e( 'Gallery previews' ); ?></h4>
<p><?php _e( 'Galleries display a beautiful grid of images right in the editor, just like they do in your published post.' ); ?></p>
<h3><?php _e( 'Focus on your content' ); ?></h3>
<p><?php _e( 'Writing and editing is smoother and more immersive with an editor that expands to fit your content as you write, and keeps the formatting tools available at all times.' ); ?></p>
</div>
<div class="col-2 last-feature">
<div class="wp-playlist wp-audio-playlist wp-playlist-light">
<div class="wp-playlist-current-item"></div>
<audio controls="controls" preload="metadata"></audio>
<div class="wp-playlist-next"></div>
<div class="wp-playlist-prev"></div>
<div class="about-video about-video-focus">
<?php
$audio_icon_js = esc_js( includes_url( 'images/media/audio.png' ) );
$wp_host = '//s.w.org/images/core/3.9/';
echo wp_video_shortcode( array(
'mp4' => '//s.w.org/images/core/4.0/focus.mp4',
'ogv' => '//s.w.org/images/core/4.0/focus.ogv',
'webm' => '//s.w.org/images/core/4.0/focus.webm',
'loop' => true,
'autoplay' => true,
'width' => 500,
'height' => 281
) );
?>

<script type="application/json">{
"type":"audio",
"tracklist":true,
"tracknumbers":true,
"images":true,
"artists":true,
"tracks":[{
"src":"<?php echo $wp_host ?>AintMisbehavin.mp3",
"type":"audio\/mpeg","title":"Ain't Misbehavin'","caption":"","description":"",
"meta":{
"artist":"Louis Armstrong & His Orchestra",
"album":"78 RPMs & Cylinder Recordings",
"genre":"Jazz",
"length_formatted":"3:21"
},
"image":{"src":"//s.w.org/images/core/3.9/louis.jpg","width":308,"height":240},
"thumb":{"src":"//s.w.org/images/core/3.9/louis.jpg","width":308,"height":240}
},
{
"src":"<?php echo $wp_host ?>JellyRollMorton-BuddyBoldensBlues.mp3",
"type":"audio\/mpeg","title":"Buddy Bolden's Blues","caption":"","description":"",
"meta":{
"artist":"Jelly Roll Morten",
"album":"78 RPMs & Cylinder Recordings",
"genre":"Jazz",
"length_formatted":"2:09"
},
"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
},
{
"src":"<?php echo $wp_host ?>DavenportBlues.mp3",
"type":"audio\/mpeg","title":"Davenport Blues","caption":"","description":"",
"meta":{
"artist":"Bix Beiderbecke & His Rhythm Jugglers",
"album":"78 RPMs & Cylinder Recordings",
"genre":"Jazz",
"length_formatted":"2:48"
},
"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
},
{
"src":"<?php echo $wp_host ?>WolverineBlues.mp3",
"type":"audio\/mpeg","title":"Wolverine Blues","caption":"","description":"",
"meta":{
"artist":"Benny Goodman's Boys",
"album":"78 RPMs & Cylinder Recordings",
"genre":"Jazz",
"length_formatted":"2:55"
},
"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
},
{
"src":"<?php echo $wp_host ?>Louisiana_Five-Dixie_Blues-1919.mp3",
"type":"audio\/mpeg","title":"Dixie Blues","caption":"","description":"",
"meta":{
"artist":"Louisiana Five",
"album":"78 RPMs & Cylinder Recordings",
"genre":"Jazz",
"length_formatted":"3:01"
},
"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
},
{
"src":"<?php echo $wp_host ?>Johnny_Hodges_Orchestra-Squaty_Roo-1941.mp3",
"type":"audio\/mpeg","title":"Squaty Roo","caption":"","description":"",
"meta":{
"artist":"Johnny Hodges Orchestra",
"album":"78 RPMs & Cylinder Recordings",
"genre":"Jazz",
"length_formatted":"2:24"
},
"image":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64},
"thumb":{"src":"<?php echo $audio_icon_js ?>","width":48,"height":64}
}]
}</script>
</div>
<h4><?php _e( 'Do more with audio and video' ); ?></h4>
<p><?php _e( 'Images have galleries; now we&#8217;ve added simple audio and video playlists, so you can showcase your music and clips.' ); ?></p>
</div>
</div>
</div>

<hr>
<hr />

<div class="changelog customize">
<div class="feature-section col two-col">
<div>
<?php
echo wp_video_shortcode( array(
'mp4' => '//s.w.org/images/core/3.9/widgets.mp4',
'ogv' => '//s.w.org/images/core/3.9/widgets.ogv',
'webm' => '//s.w.org/images/core/3.9/widgets.webm',
'loop' => true,
'autoplay' => true,
'width' => 499
) );
?>
<h4><?php _e( 'Live widget and header previews' ); ?></h4>
<p><?php _e( 'Add, edit, and rearrange your site&#8217;s widgets right in the theme customizer. No &#8220;save and surprise&#8221; &mdash; preview your changes live and only save them when you&#8217;re ready.' ); ?></p>
<p><?php _e( 'The improved header image tool also lets you upload, crop, and manage headers while customizing your theme.' ); ?></p>
<div class="col-1">
<img src="//s.w.org/images/core/4.0/plugins.png" />
</div>
<div class="last-feature">
<img src="//s.w.org/images/core/3.9/theme.jpg?0" />
<h4><?php _e( 'Stunning new theme browser' ); ?></h4>
<p><?php _e( 'Looking for a new theme should be easy and fun. Lose yourself in the boundless supply of free WordPress.org themes with the beautiful new theme browser.' ); ?></p>
<?php if ( current_user_can( 'install_themes' ) ) { ?>
<p><a href="<?php echo network_admin_url( 'theme-install.php' ); ?>" class="button button-large button-primary"><?php _e( 'Browse Themes' ); ?></a></p>
<?php } ?>
<div class="col-2 last-feature">
<h3 class="higher"><?php _e( 'Finding the right plugin' ); ?></h3>
<p><?php _e( 'There are more than 30,000 free and open source plugins in the WordPress plugin directory. WordPress 4.0 makes it easier to find the right one for your needs, with new metrics, improved search, and a more visual browsing experience.' ); ?></p>
<a href="<?php echo admin_url( 'plugin-install.php' ); ?>" class="button button-large button-primary"><?php _e( 'Browse plugins' ); ?></a>
</div>
</div>
</div>

<hr>
<hr />

<div class="changelog under-the-hood">
<h3><?php _e( 'Under the Hood' ); ?></h3>

<div class="feature-section col three-col">
<div>
<h4><?php _e( 'Semantic Captions and Galleries' ); ?></h4>
<p><?php _e( 'Theme developers have new options for images and galleries that use intelligent HTML5 markup.' ); ?></p>

<h4><?php _e( 'Inline Code Documentation' ); ?></h4>
<p><?php _e( 'Every action and filter hook in WordPress is now documented, along with expanded documentation for the media manager and customizer APIs.' ); ?></p>
<h4><?php _e( 'Customizer API' ); ?></h4>
<p><?php _e( 'Contexts, panels, and a wider array of controls are now supported in the customizer.' ); ?></p>
</div>
<div>
<h4><?php _e( 'External Libraries' ); ?></h4>
<p><?php _e( 'Updated libraries: TinyMCE&nbsp;4, jQuery&nbsp;1.11, Backbone&nbsp;1.1, Underscore&nbsp;1.6, Plupload&nbsp;2, MediaElement&nbsp;2.14, Masonry&nbsp;3.' ); ?></p>

<h4><?php _e( 'Improved Database Layer' ); ?></h4>
<p><?php _e( 'Database connections are now more fault-resistant and have improved compatibility with PHP 5.5 and MySQL 5.6.' ); ?></p>
<h4><?php _e( 'Query Ordering' ); ?></h4>
<p><?php
/* translators: 1: "ORDER BY" (SQL), 2: "WP_Query" */
printf( __( 'Developers have more flexibility creating %1$s clauses through %2$s.' ), '<code>ORDER&nbsp;BY</code>', '<code>WP_Query</code>' );
?></p>
</div>
<div class="last-feature">
<h4><?php _e( 'New Utility Functions' ); ?></h4>
<p><?php _e( 'Identify a hook in progress with <code>doing_action()</code> and <code>doing_filter()</code>, and manipulate custom image sizes with <code>has_image_size()</code> and <code>remove_image_size()</code>.' ); ?></p>
<p><?php _e( 'Plugins and themes registering custom image sizes can now register suggested cropping points. For example, prevent heads from being cropped out of photos with a top-center crop.' ); ?></p>
<h4><?php _e( 'External Libraries' ); ?></h4>
<p><?php _e( 'Updated libraries: TinyMCE&nbsp;4.1.3, jQuery&nbsp;1.11.1, MediaElement&nbsp;2.15.' ); ?></p>
</div>
</div>
</div>

<hr />

<hr>
<div class="return-to-dashboard">
<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php
is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' );
?></a> |
<?php endif; ?>
<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php
is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
</div>

<div class="return-to-dashboard">
<?php if ( current_user_can( 'update_core' ) && isset( $_GET['updated'] ) ) : ?>
<a href="<?php echo esc_url( self_admin_url( 'update-core.php' ) ); ?>"><?php
is_multisite() ? _e( 'Return to Updates' ) : _e( 'Return to Dashboard &rarr; Updates' );
?></a> |
<?php endif; ?>
<a href="<?php echo esc_url( self_admin_url() ); ?>"><?php
is_blog_admin() ? _e( 'Go to Dashboard &rarr; Home' ) : _e( 'Go to Dashboard' ); ?></a>
</div>

</div>
Expand Down
7 changes: 5 additions & 2 deletions wp-admin/admin-ajax.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
* @since 2.1.0
*/
define( 'DOING_AJAX', true );
define( 'WP_ADMIN', true );
if ( ! defined( 'WP_ADMIN' ) ) {
define( 'WP_ADMIN', true );
}

/** Load WordPress Bootstrap */
require_once( dirname( dirname( __FILE__ ) ) . '/wp-load.php' );
Expand Down Expand Up @@ -58,7 +60,8 @@
'wp-remove-post-lock', 'dismiss-wp-pointer', 'upload-attachment', 'get-attachment',
'query-attachments', 'save-attachment', 'save-attachment-compat', 'send-link-to-editor',
'send-attachment-to-editor', 'save-attachment-order', 'heartbeat', 'get-revision-diffs',
'save-user-color-scheme', 'update-widget', 'query-themes',
'save-user-color-scheme', 'update-widget', 'query-themes', 'parse-embed', 'set-attachment-thumbnail',
'parse-media-shortcode'
);

// Register core Ajax calls.
Expand Down
3 changes: 2 additions & 1 deletion wp-admin/admin-header.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,8 +177,9 @@

<?php
// Make sure the customize body classes are correct as early as possible.
if ( current_user_can( 'edit_theme_options' ) )
if ( current_user_can( 'customize' ) ) {
wp_customize_support_script();
}
?>

<div id="wpwrap">
Expand Down
Loading

0 comments on commit 551deae

Please sign in to comment.