Wordpress 2.9

[autoinstalls/wordpress.git] / wp-admin / includes / theme.php

diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php
index f6eb03df30fd0d998ee4fd31fb02d9b3dd1aac92..b39351fc9c86dd15a4faae0a1aa8db8b38d576cb 100644 (file)
--- a/wp-admin/includes/theme.php
+++ b/wp-admin/includes/theme.php
@@ -28,6 +28,8 @@ function current_theme_info() {
        $ct->description = $themes[$current_theme]['Description'];
        $ct->author = $themes[$current_theme]['Author'];
        $ct->tags = $themes[$current_theme]['Tags'];
+       $ct->theme_root = $themes[$current_theme]['Theme Root'];
+       $ct->theme_root_uri = $themes[$current_theme]['Theme Root URI'];
        return $ct;
 }
 
@@ -115,28 +117,36 @@ function get_broken_themes() {
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Get the Page Templates available in this theme
  *
  * @since unknown
  *
- * @return unknown
+ * @return array Key is template name, Value is template name
  */
 function get_page_templates() {
        $themes = get_themes();
        $theme = get_current_theme();
        $templates = $themes[$theme]['Template Files'];
-       $page_templates = array ();
+       $page_templates = array();
 
        if ( is_array( $templates ) ) {
+               $base = array( trailingslashit(get_template_directory()), trailingslashit(get_stylesheet_directory()) );
+
                foreach ( $templates as $template ) {
-                       $template_data = implode( '', file( WP_CONTENT_DIR.$template ));
+                       $basename = str_replace($base, '', $template);
+
+                       // don't allow template files in subdirectories
+                       if ( false !== strpos($basename, '/') )
+                               continue;
+
+                       $template_data = implode( '', file( $template ));
 
                        $name = '';
                        if ( preg_match( '|Template Name:(.*)$|mi', $template_data, $name ) )
                                $name = _cleanup_header_comment($name[1]);
 
                        if ( !empty( $name ) ) {
-                               $page_templates[trim( $name )] = basename( $template );
+                               $page_templates[trim( $name )] = $basename;
                        }
                }
        }
@@ -144,4 +154,18 @@ function get_page_templates() {
        return $page_templates;
 }
 
+/**
+ * Tidies a filename for url display by the theme editor.
+ * 
+ * @since 2.9.0
+ * @private
+ * 
+ * @param string $fullpath Full path to the theme file
+ * @param string $containingfolder Path of the theme parent folder
+ * @return string
+ */
+function _get_template_edit_filename($fullpath, $containingfolder) {
+       return str_replace(dirname(dirname( $containingfolder )) , '', $fullpath);
+}
+
 ?>