Ticket #10467: register_theme_directory-004.patch
File register_theme_directory-004.patch, 18.5 KB (added by , 16 years ago) |
---|
-
Users/andy/Sites/wptrunk/wp-includes/theme.php
34 34 */ 35 35 function get_stylesheet_directory() { 36 36 $stylesheet = get_stylesheet(); 37 $stylesheet_dir = get_theme_root() . "/$stylesheet"; 38 return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet); 37 $theme_root = get_theme_root( $stylesheet ); 38 $stylesheet_dir = "$theme_root/$stylesheet"; 39 40 return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root ); 39 41 } 40 42 41 43 /** … … 47 49 */ 48 50 function get_stylesheet_directory_uri() { 49 51 $stylesheet = get_stylesheet(); 50 $stylesheet_dir_uri = get_theme_root_uri() . "/$stylesheet"; 51 return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet); 52 $theme_root_uri = get_theme_root_uri( $stylesheet ); 53 $stylesheet_dir_uri = "$theme_root_uri/$stylesheet"; 54 55 return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri ); 52 56 } 53 57 54 58 /** … … 123 127 */ 124 128 function get_template_directory() { 125 129 $template = get_template(); 126 $template_dir = get_theme_root() . "/$template"; 127 return apply_filters('template_directory', $template_dir, $template); 130 $theme_root = get_theme_root( $template ); 131 $template_dir = "$theme_root/$template"; 132 133 return apply_filters( 'template_directory', $template_dir, $template, $theme_root ); 128 134 } 129 135 130 136 /** … … 137 143 */ 138 144 function get_template_directory_uri() { 139 145 $template = get_template(); 140 $template_dir_uri = get_theme_root_uri() . "/$template"; 141 return apply_filters('template_directory_uri', $template_dir_uri, $template); 146 $theme_root_uri = get_theme_root_uri( $template ); 147 $template_dir_uri = "$theme_root_uri/$template"; 148 149 return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri ); 142 150 } 143 151 144 152 /** … … 253 261 if ( isset($wp_themes) ) 254 262 return $wp_themes; 255 263 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); 264 /* Register wp-content/themes as a theme directory */ 265 register_theme_directory( 'themes' ); 261 266 262 // Files in wp-content/themes directory and one subdir down 263 $themes_dir = @ opendir($theme_root); 264 if ( !$themes_dir ) 267 if ( !$theme_files = search_theme_directories() ) 265 268 return false; 269 270 asort( $theme_files ); 271 272 foreach ( (array) $theme_files as $theme_file ) { 273 $theme_root = $theme_file['theme_root']; 274 $theme_file = $theme_file['theme_file']; 266 275 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 276 if ( !is_readable("$theme_root/$theme_file") ) { 316 277 $wp_broken_themes[$theme_file] = array('Name' => $theme_file, 'Title' => $theme_file, 'Description' => __('File not readable.')); 317 278 continue; … … 346 307 else 347 308 continue; 348 309 } 310 311 $template = trim( $template ); 349 312 350 $template = trim($template);351 352 313 if ( !file_exists("$theme_root/$template/index.php") ) { 353 314 $parent_dir = dirname(dirname($theme_file)); 354 315 if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) { 355 $template = "$ parent_dir/$template";316 $template = "$theme_root/$parent_dir/$template"; 356 317 } else { 357 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); 358 continue; 318 /** 319 * The parent theme doesn't exist in the current theme's folder or sub folder 320 * so lets use the theme root for the parent template. 321 */ 322 $parent_theme_root = $theme_files[$template]['theme_root']; 323 if ( file_exists( "$parent_theme_root/$template/index.php" ) ) { 324 $template = "$parent_theme_root/$template"; 325 } else { 326 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); 327 continue; 328 } 329 359 330 } 331 } else { 332 $template = trim( $theme_root . '/' . $template ); 360 333 } 361 334 362 335 $stylesheet_files = array(); 363 336 $template_files = array(); 364 337 … … 367 340 while ( ($file = $stylesheet_dir->read()) !== false ) { 368 341 if ( !preg_match('|^\.+$|', $file) ) { 369 342 if ( preg_match('|\.css$|', $file) ) 370 $stylesheet_files[] = "$theme_ loc/$stylesheet/$file";343 $stylesheet_files[] = "$theme_root/$stylesheet/$file"; 371 344 elseif ( preg_match('|\.php$|', $file) ) 372 $template_files[] = "$theme_ loc/$stylesheet/$file";345 $template_files[] = "$theme_root/$stylesheet/$file"; 373 346 } 374 347 } 375 348 @ $stylesheet_dir->close(); 376 349 } 377 350 378 $template_dir = @ dir("$t heme_root/$template");351 $template_dir = @ dir("$template"); 379 352 if ( $template_dir ) { 380 353 while ( ($file = $template_dir->read()) !== false ) { 381 354 if ( preg_match('|^\.+$|', $file) ) 382 355 continue; 383 356 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");357 $template_files[] = "$template/$file"; 358 } elseif ( is_dir("$template/$file") ) { 359 $template_subdir = @ dir("$template/$file"); 387 360 while ( ($subfile = $template_subdir->read()) !== false ) { 388 361 if ( preg_match('|^\.+$|', $subfile) ) 389 362 continue; 390 363 if ( preg_match('|\.php$|', $subfile) ) 391 $template_files[] = "$t heme_loc/$template/$file/$subfile";364 $template_files[] = "$template/$file/$subfile"; 392 365 } 393 366 @ $template_subdir->close(); 394 367 } … … 422 395 } 423 396 } 424 397 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']); 398 $theme_roots[$stylesheet] = str_replace( WP_CONTENT_DIR, '', $theme_root ); 399 $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 400 } 427 401 428 / / Resolve theme dependencies.429 $theme_names = array_keys( $themes);402 /* Resolve theme dependencies. */ 403 $theme_names = array_keys( $themes ); 430 404 405 /* Store theme roots in the DB */ 406 update_option( 'theme_roots', $theme_roots ); 407 431 408 foreach ( (array) $theme_names as $theme_name ) { 432 409 $themes[$theme_name]['Parent Theme'] = ''; 433 410 if ( $themes[$theme_name]['Stylesheet'] != $themes[$theme_name]['Template'] ) { … … 441 418 } 442 419 443 420 $wp_themes = $themes; 444 421 445 422 return $themes; 446 423 } 447 424 … … 499 476 } 500 477 501 478 /** 479 * Register a directory that contains themes relative to the content directory. 480 * 481 * @since 2.9.0 482 * 483 * @return bool 484 */ 485 function register_theme_directory( $directory ) { 486 global $wp_theme_directories; 487 488 /* The theme directory should be relative to the content directory */ 489 $registered_directory = WP_CONTENT_DIR . '/' . $directory; 490 491 /* If this folder does not exist, return and do not register */ 492 if ( !file_exists( $registered_directory ) ) 493 return false; 494 495 $wp_theme_directories[] = $registered_directory; 496 497 return true; 498 } 499 500 /** 501 * Search all registered theme directories for complete and valid themes. 502 * 503 * @since 2.9.0 504 * 505 * @return array Valid themes found 506 */ 507 function search_theme_directories() { 508 global $wp_theme_directories, $wp_broken_themes; 509 510 if ( empty( $wp_theme_directories ) ) 511 return false; 512 513 $theme_files = array(); 514 $wp_broken_themes = array(); 515 516 /* Loop the registered theme directories and extract all themes */ 517 foreach ( (array) $wp_theme_directories as $theme_root ) { 518 $theme_loc = $theme_root; 519 520 /* We don't want to replace all forward slashes, see Trac #4541 */ 521 if ( '/' != WP_CONTENT_DIR ) 522 $theme_loc = str_replace(WP_CONTENT_DIR, '', $theme_root); 523 524 /* Files in the root of the current theme directory and one subdir down */ 525 $themes_dir = @ opendir($theme_root); 526 527 if ( !$themes_dir ) 528 return false; 529 530 while ( ($theme_dir = readdir($themes_dir)) !== false ) { 531 if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) { 532 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) 533 continue; 534 535 $stylish_dir = @ opendir($theme_root . '/' . $theme_dir); 536 $found_stylesheet = false; 537 538 while ( ($theme_file = readdir($stylish_dir)) !== false ) { 539 if ( $theme_file == 'style.css' ) { 540 $theme_files[$theme_dir] = array( 'theme_file' => $theme_dir . '/' . $theme_file, 'theme_root' => $theme_root ); 541 $found_stylesheet = true; 542 break; 543 } 544 } 545 @closedir($stylish_dir); 546 547 if ( !$found_stylesheet ) { // look for themes in that dir 548 $subdir = "$theme_root/$theme_dir"; 549 $subdir_name = $theme_dir; 550 $theme_subdir = @ opendir( $subdir ); 551 552 while ( ($theme_dir = readdir($theme_subdir)) !== false ) { 553 if ( is_dir( $subdir . '/' . $theme_dir) && is_readable($subdir . '/' . $theme_dir) ) { 554 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) 555 continue; 556 557 $stylish_dir = @ opendir($subdir . '/' . $theme_dir); 558 $found_stylesheet = false; 559 560 while ( ($theme_file = readdir($stylish_dir)) !== false ) { 561 if ( $theme_file == 'style.css' ) { 562 $theme_files[$theme_dir] = array( 'theme_file' => $subdir_name . '/' . $theme_dir . '/' . $theme_file, 'theme_root' => $theme_root ); 563 $found_stylesheet = true; 564 break; 565 } 566 } 567 @closedir($stylish_dir); 568 } 569 } 570 @closedir($theme_subdir); 571 572 $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.')); 573 } 574 } 575 } 576 if ( is_dir( $theme_dir ) ) 577 @closedir( $theme_dir ); 578 } 579 580 return $theme_files; 581 } 582 583 /** 502 584 * Retrieve path to themes directory. 503 585 * 504 586 * Does not have trailing slash. 505 587 * 506 588 * @since 1.5.0 589 * @param $stylesheet_or_template The stylesheet or template name of the theme 507 590 * @uses apply_filters() Calls 'theme_root' filter on path. 508 591 * 509 592 * @return string Theme path. 510 593 */ 511 function get_theme_root() { 512 return apply_filters('theme_root', WP_CONTENT_DIR . "/themes"); 594 function get_theme_root( $stylesheet_or_template = false ) { 595 $theme_roots = get_option( 'theme_roots' ); 596 597 if ( $theme_roots[$stylesheet_or_template] ) 598 $theme_root = WP_CONTENT_DIR . '/' . $theme_roots[$stylesheet_or_template]; 599 else 600 $theme_root = WP_CONTENT_DIR . '/themes'; 601 602 return apply_filters( 'theme_root', $theme_root ); 513 603 } 514 604 515 605 /** … … 518 608 * Does not have trailing slash. 519 609 * 520 610 * @since 1.5.0 611 * @param $stylesheet_or_template The stylesheet or template name of the theme 521 612 * 522 613 * @return string Themes URI. 523 614 */ 524 function get_theme_root_uri() { 525 return apply_filters('theme_root_uri', content_url('themes'), get_option('siteurl')); 615 function get_theme_root_uri( $stylesheet_or_template = false ) { 616 $theme_roots = get_option( 'theme_roots' ); 617 618 if ( $theme_roots[$stylesheet_or_template] ) 619 $theme_root_uri = content_url( $theme_roots[$stylesheet_or_template] ); 620 else 621 $theme_root_uri = content_url( 'themes' ); 622 623 return apply_filters( 'theme_root_uri', $theme_root_uri, get_option('siteurl'), $stylesheet_or_template ); 526 624 } 527 625 528 626 /** -
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>