← Back to branch summary

~canonical-sysadmins/wordpress/4.7.2

« back to all changes in this revision

Viewing changes to wp-admin/includes/misc.php

  • Committer: Haw Loeung
  • Date: 2016-12-13 06:56:21 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: haw.loeung@canonical.com-20161213065621-8tcu7u7vlxgs2s81
Merge WP4.7 from upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
wp-admin/includes/misc.php
133
133
                $lines[] = rtrim( fgets( $fp ), "\r\n" );
134
134
        }
135
135
 
136
 
        // Split out the existing file into the preceeding lines, and those that appear after the marker
 
136
        // Split out the existing file into the preceding lines, and those that appear after the marker
137
137
        $pre_lines = $post_lines = $existing_lines = array();
138
138
        $found_marker = $found_end_marker = false;
139
139
        foreach ( $lines as $line ) {