WordPress.org
Get WordPress

Make WordPress Core

Ticket #42355: 42355.diff

File 42355.diff, 1.5 KB (added by jamosova, 8 years ago)

  • new file .idea/vcs.xml 

    diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000000..94a25f7f4c
    - +  
     1<?xml version="1.0" encoding="UTF-8"?>
     2<project version="4">
     3  <component name="VcsDirectoryMappings">
     4    <mapping directory="$PROJECT_DIR$" vcs="Git" />
     5  </component>
     6</project>
     7 No newline at end of file

  • src/wp-admin/plugins.php 

    diff --git a/src/wp-admin/plugins.php b/src/wp-admin/plugins.php
index 4d8c797b04..b253675403 100644
    a b if ( isset( $_GET['error'] ) ) :  
    479479        if ( isset( $_GET['main'] ) ) {
    480480                $errmsg = __( 'You cannot delete a plugin while it is active on the main site.' );
    481481        } elseif ( isset( $_GET['charsout'] ) ) {
    482                 $errmsg = sprintf( __( 'The plugin generated %d characters of <strong>unexpected output</strong> during activation. If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.' ), $_GET['charsout'] );
     482                $errmsg = sprintf( _n(
     483                        'The plugin generated %d character of <strong>unexpected output</strong> during activation.',
     484                        'The plugin generated %d characters of <strong>unexpected output</strong> during activation.' ,
     485                        $_GET['charsout']
     486                ), $_GET['charsout'] ) . __( 'If you notice &#8220;headers already sent&#8221; messages, problems with syndication feeds or other issues, try deactivating or removing this plugin.' );
    483487        } else {
    484488                $errmsg = __( 'Plugin could not be activated because it triggered a <strong>fatal error</strong>.' );
    485489        }