Ticket #10467: register_theme_directory.patch
File register_theme_directory.patch, 17.7 KB (added by , 16 years ago) |
---|
-
Users/andy/Sites/wptrunk/wp-includes/theme.php
33 33 * @return string Path to current theme directory. 34 34 */ 35 35 function get_stylesheet_directory() { 36 global $wp_themes; 37 38 if ( !isset( $wp_themes ) ) 39 $wp_themes = get_themes(); 40 41 $current_theme = get_current_theme(); 36 42 $stylesheet = get_stylesheet(); 37 $stylesheet_dir = get_theme_root() . "/$stylesheet"; 38 return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet); 43 44 foreach ( $wp_themes as $theme ) { 45 if ( $theme['Stylesheet'] == $stylesheet ) 46 $theme_root = $theme['Theme Root']; 47 } 48 49 $stylesheet_dir = "$theme_root/$stylesheet"; 50 51 return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root ); 39 52 } 40 53 41 54 /** … … 46 59 * @return string 47 60 */ 48 61 function get_stylesheet_directory_uri() { 62 global $wp_themes; 63 64 if ( !isset( $wp_themes ) ) 65 $wp_themes = get_themes(); 66 67 $current_theme = get_current_theme(); 49 68 $stylesheet = get_stylesheet(); 50 $stylesheet_dir_uri = get_theme_root_uri() . "/$stylesheet"; 51 return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet); 69 70 foreach ( $wp_themes as $theme ) { 71 if ( $theme['Stylesheet'] == $stylesheet ) 72 $theme_root_uri = $theme['Theme Root URI']; 73 } 74 75 $stylesheet_dir_uri = "$theme_root_uri/$stylesheet"; 76 return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri ); 52 77 } 53 78 54 79 /** … … 122 147 * @return string Template directory path. 123 148 */ 124 149 function get_template_directory() { 150 global $wp_themes; 151 152 if ( !isset( $wp_themes ) ) 153 $wp_themes = get_themes(); 154 125 155 $template = get_template(); 126 $template_dir = get_theme_root() . "/$template"; 127 return apply_filters('template_directory', $template_dir, $template); 156 157 foreach ( $wp_themes as $theme ) { 158 if ( $theme['Template'] == $template && empty( $theme['Parent Theme'] ) ) 159 $theme_root = $theme['Theme Root']; 160 } 161 162 $template_dir = "$theme_root/$template"; 163 return apply_filters( 'template_directory', $template_dir, $template, $theme_root ); 128 164 } 129 165 130 166 /** … … 136 172 * @return string Template directory URI. 137 173 */ 138 174 function get_template_directory_uri() { 175 global $wp_themes; 176 177 if ( !isset( $wp_themes ) ) 178 $wp_themes = get_themes(); 179 180 $current_theme = get_current_theme(); 139 181 $template = get_template(); 140 $template_dir_uri = get_theme_root_uri() . "/$template"; 141 return apply_filters('template_directory_uri', $template_dir_uri, $template); 182 183 foreach ( $wp_themes as $theme ) { 184 if ( $theme['Template'] == $template && empty( $theme['Parent Theme'] ) ) 185 $theme_root_uri = $theme['Theme Root URI']; 186 } 187 188 $template_dir_uri = "$theme_root_uri/$template"; 189 return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri ); 142 190 } 143 191 144 192 /** … … 253 301 if ( isset($wp_themes) ) 254 302 return $wp_themes; 255 303 256 $themes = array(); 257 $wp_broken_themes = array(); 258 $theme_loc = $theme_root = get_theme_root(); 259 if ( '/' != WP_CONTENT_DIR ) // don't want to replace all forward slashes, see Trac #4541 260 $theme_loc = str_replace(WP_CONTENT_DIR, '', $theme_root); 304 /* Register wp-content/themes as a theme directory */ 305 register_theme_directory( 'themes' ); 261 306 262 // Files in wp-content/themes directory and one subdir down 263 $themes_dir = @ opendir($theme_root); 264 if ( !$themes_dir ) 307 if ( !$theme_files = search_theme_directories() ) 265 308 return false; 309 310 asort( $theme_files ); 311 312 foreach ( (array) $theme_files as $theme_file ) { 313 $theme_root = $theme_file['theme_root']; 314 $theme_file = $theme_file['theme_file']; 266 315 267 while ( ($theme_dir = readdir($themes_dir)) !== false ) {268 if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) {269 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' )270 continue;271 $stylish_dir = @ opendir($theme_root . '/' . $theme_dir);272 $found_stylesheet = false;273 while ( ($theme_file = readdir($stylish_dir)) !== false ) {274 if ( $theme_file == 'style.css' ) {275 $theme_files[] = $theme_dir . '/' . $theme_file;276 $found_stylesheet = true;277 break;278 }279 }280 @closedir($stylish_dir);281 if ( !$found_stylesheet ) { // look for themes in that dir282 $subdir = "$theme_root/$theme_dir";283 $subdir_name = $theme_dir;284 $theme_subdir = @ opendir( $subdir );285 while ( ($theme_dir = readdir($theme_subdir)) !== false ) {286 if ( is_dir( $subdir . '/' . $theme_dir) && is_readable($subdir . '/' . $theme_dir) ) {287 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' )288 continue;289 $stylish_dir = @ opendir($subdir . '/' . $theme_dir);290 $found_stylesheet = false;291 while ( ($theme_file = readdir($stylish_dir)) !== false ) {292 if ( $theme_file == 'style.css' ) {293 $theme_files[] = $subdir_name . '/' . $theme_dir . '/' . $theme_file;294 $found_stylesheet = true;295 break;296 }297 }298 @closedir($stylish_dir);299 }300 }301 @closedir($theme_subdir);302 $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.'));303 }304 }305 }306 if ( is_dir( $theme_dir ) )307 @closedir( $theme_dir );308 309 if ( !$themes_dir || !$theme_files )310 return $themes;311 312 sort($theme_files);313 314 foreach ( (array) $theme_files as $theme_file ) {315 316 if ( !is_readable("$theme_root/$theme_file") ) { 316 317 $wp_broken_themes[$theme_file] = array('Name' => $theme_file, 'Title' => $theme_file, 'Description' => __('File not readable.')); 317 318 continue; … … 346 347 else 347 348 continue; 348 349 } 350 351 $template = trim( $template ); 349 352 350 $template = trim($template);351 352 353 if ( !file_exists("$theme_root/$template/index.php") ) { 353 354 $parent_dir = dirname(dirname($theme_file)); 354 355 if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) { 355 $template = "$ parent_dir/$template";356 $template = "$theme_root/$parent_dir/$template"; 356 357 } else { 357 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); 358 continue; 358 /** 359 * The parent theme doesn't exist in the current theme's folder or sub folder 360 * so lets use the theme root for the parent template. 361 */ 362 $parent_theme_root = $theme_files[$template]['theme_root']; 363 if ( file_exists( "$parent_theme_root/$template/index.php" ) ) { 364 $template = "$parent_theme_root/$template"; 365 } else { 366 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); 367 continue; 368 } 369 359 370 } 371 } else { 372 $template = trim( $theme_root . '/' . $template ); 360 373 } 361 374 362 375 $stylesheet_files = array(); 363 376 $template_files = array(); 364 377 … … 367 380 while ( ($file = $stylesheet_dir->read()) !== false ) { 368 381 if ( !preg_match('|^\.+$|', $file) ) { 369 382 if ( preg_match('|\.css$|', $file) ) 370 $stylesheet_files[] = "$theme_ loc/$stylesheet/$file";383 $stylesheet_files[] = "$theme_root/$stylesheet/$file"; 371 384 elseif ( preg_match('|\.php$|', $file) ) 372 $template_files[] = "$theme_ loc/$stylesheet/$file";385 $template_files[] = "$theme_root/$stylesheet/$file"; 373 386 } 374 387 } 375 388 @ $stylesheet_dir->close(); 376 389 } 377 390 378 $template_dir = @ dir("$t heme_root/$template");391 $template_dir = @ dir("$template"); 379 392 if ( $template_dir ) { 380 393 while ( ($file = $template_dir->read()) !== false ) { 381 394 if ( preg_match('|^\.+$|', $file) ) 382 395 continue; 383 396 if ( preg_match('|\.php$|', $file) ) { 384 $template_files[] = "$t heme_loc/$template/$file";385 } elseif ( is_dir("$t heme_root/$template/$file") ) {386 $template_subdir = @ dir("$t heme_root/$template/$file");397 $template_files[] = "$template/$file"; 398 } elseif ( is_dir("$template/$file") ) { 399 $template_subdir = @ dir("$template/$file"); 387 400 while ( ($subfile = $template_subdir->read()) !== false ) { 388 401 if ( preg_match('|^\.+$|', $subfile) ) 389 402 continue; 390 403 if ( preg_match('|\.php$|', $subfile) ) 391 $template_files[] = "$t heme_loc/$template/$file/$subfile";404 $template_files[] = "$template/$file/$subfile"; 392 405 } 393 406 @ $template_subdir->close(); 394 407 } … … 422 435 } 423 436 } 424 437 425 $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template, 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot, 'Tags' => $theme_data['Tags']);438 $themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => basename( $template ), 'Stylesheet' => $stylesheet, 'Template Files' => $template_files, 'Stylesheet Files' => $stylesheet_files, 'Template Dir' => $template_dir, 'Stylesheet Dir' => $stylesheet_dir, 'Status' => $theme_data['Status'], 'Screenshot' => $screenshot, 'Tags' => $theme_data['Tags'], 'Theme Root' => $theme_root, 'Theme Root URI' => str_replace( WP_CONTENT_DIR, content_url(), $theme_root ) ); 426 439 } 427 440 428 441 // Resolve theme dependencies. … … 441 454 } 442 455 443 456 $wp_themes = $themes; 444 457 445 458 return $themes; 446 459 } 447 460 … … 499 512 } 500 513 501 514 /** 515 * Register a directory that contains themes relative to the content directory. 516 * 517 * @since 2.9.0 518 * 519 * @return bool 520 */ 521 function register_theme_directory( $directory ) { 522 global $wp_theme_directories; 523 524 /* The theme directory should be relative to the content directory */ 525 $registered_directory = WP_CONTENT_DIR . '/' . $directory; 526 527 /* If this folder does not exist, return and do not register */ 528 if ( !file_exists( $registered_directory ) ) 529 return false; 530 531 $wp_theme_directories[] = $registered_directory; 532 533 return true; 534 } 535 536 /** 537 * Search all registered theme directories for complete and valid themes. 538 * 539 * @since 2.9.0 540 * 541 * @return array Valid themes found 542 */ 543 function search_theme_directories() { 544 global $wp_theme_directories; 545 global $wp_broken_themes; 546 547 if ( empty( $wp_theme_directories ) ) 548 return false; 549 550 $themes = array(); 551 $wp_broken_themes = array(); 552 553 /* Loop the registered theme directories and extract all themes */ 554 foreach ( (array) $wp_theme_directories as $theme_root ) { 555 $theme_loc = $theme_root; 556 557 /* We don't want to replace all forward slashes, see Trac #4541 */ 558 if ( '/' != WP_CONTENT_DIR ) 559 $theme_loc = str_replace(WP_CONTENT_DIR, '', $theme_root); 560 561 /* Files in the root of the current theme directory and one subdir down */ 562 $themes_dir = @ opendir($theme_root); 563 564 if ( !$themes_dir ) 565 return false; 566 567 while ( ($theme_dir = readdir($themes_dir)) !== false ) { 568 if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) { 569 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) 570 continue; 571 572 $stylish_dir = @ opendir($theme_root . '/' . $theme_dir); 573 $found_stylesheet = false; 574 575 while ( ($theme_file = readdir($stylish_dir)) !== false ) { 576 if ( $theme_file == 'style.css' ) { 577 $theme_files[$theme_dir] = array( 'theme_file' => $theme_dir . '/' . $theme_file, 'theme_root' => $theme_root ); 578 $found_stylesheet = true; 579 break; 580 } 581 } 582 @closedir($stylish_dir); 583 584 if ( !$found_stylesheet ) { // look for themes in that dir 585 $subdir = "$theme_root/$theme_dir"; 586 $subdir_name = $theme_dir; 587 $theme_subdir = @ opendir( $subdir ); 588 589 while ( ($theme_dir = readdir($theme_subdir)) !== false ) { 590 if ( is_dir( $subdir . '/' . $theme_dir) && is_readable($subdir . '/' . $theme_dir) ) { 591 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) 592 continue; 593 594 $stylish_dir = @ opendir($subdir . '/' . $theme_dir); 595 $found_stylesheet = false; 596 597 while ( ($theme_file = readdir($stylish_dir)) !== false ) { 598 if ( $theme_file == 'style.css' ) { 599 $theme_files[$theme_dir] = array( 'theme_file' => $subdir_name . '/' . $theme_dir . '/' . $theme_file, 'theme_root' => $theme_root ); 600 $found_stylesheet = true; 601 break; 602 } 603 } 604 @closedir($stylish_dir); 605 } 606 } 607 @closedir($theme_subdir); 608 609 $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.')); 610 } 611 } 612 } 613 if ( is_dir( $theme_dir ) ) 614 @closedir( $theme_dir ); 615 } 616 617 return $theme_files; 618 } 619 620 /** 502 621 * Retrieve path to themes directory. 503 622 * 504 623 * Does not have trailing slash. -
Users/andy/Sites/wptrunk/wp-admin/includes/theme.php
28 28 $ct->description = $themes[$current_theme]['Description']; 29 29 $ct->author = $themes[$current_theme]['Author']; 30 30 $ct->tags = $themes[$current_theme]['Tags']; 31 $ct->theme_root = $themes[$current_theme]['Theme Root']; 32 $ct->theme_root_uri = $themes[$current_theme]['Theme Root URI']; 31 33 return $ct; 32 34 } 33 35 -
Users/andy/Sites/wptrunk/wp-admin/themes.php
132 132 <h3><?php _e('Current Theme'); ?></h3> 133 133 <div id="current-theme"> 134 134 <?php if ( $ct->screenshot ) : ?> 135 <img src="<?php echo content_url($ct->stylesheet_dir . '/' . $ct->screenshot); ?>" alt="<?php _e('Current theme preview'); ?>" />135 <img src="<?php echo $ct->theme_root_uri . '/' . $ct->stylesheet . '/' . $ct->screenshot; ?>" alt="<?php _e('Current theme preview'); ?>" /> 136 136 <?php endif; ?> 137 137 <h4><?php 138 138 /* translators: 1: theme title, 2: theme version, 3: theme author */ 139 139 printf(__('%1$s %2$s by %3$s'), $ct->title, $ct->version, $ct->author) ; ?></h4> 140 140 <p class="theme-description"><?php echo $ct->description; ?></p> 141 141 <?php if ($ct->parent_theme) { ?> 142 <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $ct->title, $ct->template_dir, $ct->stylesheet_dir, $ct->title, $ct->parent_theme); ?></p>142 <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ), $ct->title, $ct->parent_theme); ?></p> 143 143 <?php } else { ?> 144 <p><?php printf(__('All of this theme’s files are located in <code>%2$s</code>.'), $ct->title, $ct->template_dir, $ct->stylesheet_dir); ?></p>144 <p><?php printf(__('All of this theme’s files are located in <code>%2$s</code>.'), $ct->title, str_replace( WP_CONTENT_DIR, '', $ct->template_dir ), str_replace( WP_CONTENT_DIR, '', $ct->stylesheet_dir ) ); ?></p> 145 145 <?php } ?> 146 146 <?php if ( $ct->tags ) : ?> 147 147 <p><?php _e('Tags:'); ?> <?php echo join(', ', $ct->tags); ?></p> … … 203 203 $stylesheet_dir = $themes[$theme_name]['Stylesheet Dir']; 204 204 $template_dir = $themes[$theme_name]['Template Dir']; 205 205 $parent_theme = $themes[$theme_name]['Parent Theme']; 206 $theme_root = $themes[$theme_name]['Theme Root']; 207 $theme_root_uri = $themes[$theme_name]['Theme Root URI']; 206 208 $preview_link = esc_url(get_option('home') . '/'); 207 209 if ( is_ssl() ) 208 210 $preview_link = str_replace( 'http://', 'https://', $preview_link ); … … 223 225 ?> 224 226 <a href="<?php echo $preview_link; ?>" class="<?php echo $thickbox_class; ?> screenshot"> 225 227 <?php if ( $screenshot ) : ?> 226 <img src="<?php echo content_url($stylesheet_dir . '/' . $screenshot); ?>" alt="" />228 <img src="<?php echo $theme_root_uri . '/' . $stylesheet . '/' . $screenshot; ?>" alt="" /> 227 229 <?php endif; ?> 228 230 </a> 229 231 <h3><?php … … 233 235 <span class='action-links'><?php echo $actions ?></span> 234 236 <?php if ($parent_theme) { 235 237 /* translators: 1: theme title, 2: template dir, 3: stylesheet_dir, 4: theme title, 5: parent_theme */ ?> 236 <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, $template_dir, $stylesheet_dir, $title, $parent_theme); ?></p>238 <p><?php printf(__('The template files are located in <code>%2$s</code>. The stylesheet files are located in <code>%3$s</code>. <strong>%4$s</strong> uses templates from <strong>%5$s</strong>. Changes made to the templates will affect both themes.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ), $title, $parent_theme); ?></p> 237 239 <?php } else { ?> 238 <p><?php printf(__('All of this theme’s files are located in <code>%2$s</code>.'), $title, $template_dir, $stylesheet_dir); ?></p>240 <p><?php printf(__('All of this theme’s files are located in <code>%2$s</code>.'), $title, str_replace( WP_CONTENT_DIR, '', $template_dir ), str_replace( WP_CONTENT_DIR, '', $stylesheet_dir ) ); ?></p> 239 241 <?php } ?> 240 242 <?php if ( $tags ) : ?> 241 243 <p><?php _e('Tags:'); ?> <?php echo join(', ', $tags); ?></p>