Context Navigation

Back to Ticket #15086

Ticket #15086: 15086.005.diff

File 15086.005.diff, 3.9 KB (added by aaroncampbell, 15 years ago)

wp-includes/formatting.php

         return apply_filters('sanitize_file_name', $filename, $filename_raw);
+}
+ /**
+ * Remove dot segments from a path
+ *
+ * @since 3.3.0
+ *
+ * @param string $input The string to remove dot segments from
+ * @return string
+ */
+function remove_dot_segments( $input ) {
+        $output = '';
+        while ( false !== strpos( $input, './' ) || false !== strpos( $input, '/.' ) || '.' === $input || '..' === $input ) {
+                // A: If the input buffer begins with a prefix of "../" or "./", then remove that prefix from the input buffer; otherwise,
+                if ( 0 === strpos( $input, '../' ) ) {
+                        $input = substr( $input, 3 );
+                } elseif ( 0 === strpos( $input, './' ) ) {
+                        $input = substr( $input, 2 );
+                }
+                // B: if the input buffer begins with a prefix of "/./" or "/.", where "." is a complete path segment, then replace that prefix with "/" in the input buffer; otherwise,
+                elseif ( 0 === strpos( $input, '/./' ) ) {
+                        $input = substr_replace( $input, '/', 0, 3 );
+                } elseif ( '/.' === $input ) {
+                        $input = '/';
+                }
+                // C: if the input buffer begins with a prefix of "/../" or "/..", where ".." is a complete path segment, then replace that prefix with "/" in the input buffer and remove the last segment and its preceding "/" (if any) from the output buffer; otherwise,
+                elseif ( 0 === strpos( $input, '/../' ) ) {
+                        $input = substr_replace( $input, '/', 0, 4 );
+                        $output = substr_replace( $output, '', strrpos( $output, '/' ) );
+                } elseif ( '/..' === $input ) {
+                        $input = '/';
+                        $output = substr_replace( $output, '', strrpos( $output, '/' ) );
+                }
+                // D: if the input buffer consists only of "." or "..", then remove that from the input buffer; otherwise,
+                elseif ( '.' === $input || '..' === $input ) {
+                        $input = '';
+                }
+                // E: move the first path segment in the input buffer to the end of the output buffer, including the initial "/" character (if any) and any subsequent characters up to, but not including, the next "/" character or the end of the input buffer
+                elseif ( false !== ( $pos = strpos( $input, '/', 1 ) ) ) {
+                        $output .= substr( $input, 0, $pos );
+                        $input = substr_replace( $input, '', 0, $pos );
+                } else {
+                        $output .= $input;
+                        $input = '';
+                }
+        }
+        return $output . $input;
+}
 /**
  * Sanitize username stripping out unsafe characters.
+ *

wp-includes/general-template.php

+ *
  * @param string $slug The slug name for the generic template.
  * @param string $name The name of the specialised template.
+ * @param string $directory The name of the directory to look in (relative to the theme)
  */
+function get_template_part( $slug, $name = null ) {
+        do_action( "get_template_part_{$slug}", $slug, $name );
+function get_template_part( $slug, $name = null, $directory = null ) {
+        if ( false !== strpos( $slug, DIRECTORY_SEPARATOR ) ) {
+                $original_slug = $slug;
+                $slug = basename( $original_slug );
+                if ( empty( $directory ) ) {
+                        $directory = dirname( $original_slug );
+                }
+        }
+        $slug = sanitize_file_name( $slug );
+        $directory = rtrim( remove_dot_segments( $directory ), DIRECTORY_SEPARATOR );
+        do_action( "get_template_part_{$slug}", $slug, $name, $directory );
         $templates = array();
+        if ( ! empty( $directory ) ) {
+                if ( isset($name) )
+                        $templates[] = $directory . DIRECTORY_SEPARATOR . "{$slug}-{$name}.php";
+                $templates[] = $directory . DIRECTORY_SEPARATOR . "{$slug}.php";
+        }
         if ( isset($name) )
                 $templates[] = "{$slug}-{$name}.php";
         $templates[] = "{$slug}.php";
         locate_template($templates, true, false);
+        locate_template( $templates, true, false );
+}
 /**

Download in other formats:

Original Format

Make WordPress Core

Context Navigation

Ticket #15086: 15086.005.diff

wp-includes/formatting.php

wp-includes/general-template.php

Download in other formats: