Ticket #10467: register_theme_directory-002.patch
File register_theme_directory-002.patch, 17.2 KB (added by , 16 years ago) |
---|
-
wp-includes/theme.php
33 33 * @return string Path to current theme directory. 34 34 */ 35 35 function get_stylesheet_directory() { 36 $wp_themes = get_themes(); 37 38 $current_theme = get_current_theme(); 36 39 $stylesheet = get_stylesheet(); 37 $stylesheet_dir = get_theme_root() . "/$stylesheet"; 38 return apply_filters('stylesheet_directory', $stylesheet_dir, $stylesheet); 40 41 foreach ( $wp_themes as $theme ) { 42 if ( $theme['Stylesheet'] == $stylesheet ) 43 $theme_root = $theme['Theme Root']; 44 } 45 46 $stylesheet_dir = "$theme_root/$stylesheet"; 47 48 return apply_filters( 'stylesheet_directory', $stylesheet_dir, $stylesheet, $theme_root ); 39 49 } 40 50 41 51 /** … … 46 56 * @return string 47 57 */ 48 58 function get_stylesheet_directory_uri() { 59 $wp_themes = get_themes(); 60 61 $current_theme = get_current_theme(); 49 62 $stylesheet = get_stylesheet(); 50 $stylesheet_dir_uri = get_theme_root_uri() . "/$stylesheet"; 51 return apply_filters('stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet); 63 64 foreach ( $wp_themes as $theme ) { 65 if ( $theme['Stylesheet'] == $stylesheet ) 66 $theme_root_uri = $theme['Theme Root URI']; 67 } 68 69 $stylesheet_dir_uri = "$theme_root_uri/$stylesheet"; 70 return apply_filters( 'stylesheet_directory_uri', $stylesheet_dir_uri, $stylesheet, $theme_root_uri ); 52 71 } 53 72 54 73 /** … … 122 141 * @return string Template directory path. 123 142 */ 124 143 function get_template_directory() { 144 $wp_themes = get_themes(); 145 125 146 $template = get_template(); 126 $template_dir = get_theme_root() . "/$template"; 127 return apply_filters('template_directory', $template_dir, $template); 147 148 foreach ( $wp_themes as $theme ) { 149 if ( $theme['Template'] == $template && empty( $theme['Parent Theme'] ) ) 150 $theme_root = $theme['Theme Root']; 151 } 152 153 $template_dir = "$theme_root/$template"; 154 return apply_filters( 'template_directory', $template_dir, $template, $theme_root ); 128 155 } 129 156 130 157 /** … … 136 163 * @return string Template directory URI. 137 164 */ 138 165 function get_template_directory_uri() { 166 $wp_themes = get_themes(); 167 168 $current_theme = get_current_theme(); 139 169 $template = get_template(); 140 $template_dir_uri = get_theme_root_uri() . "/$template"; 141 return apply_filters('template_directory_uri', $template_dir_uri, $template); 170 171 foreach ( $wp_themes as $theme ) { 172 if ( $theme['Template'] == $template && empty( $theme['Parent Theme'] ) ) 173 $theme_root_uri = $theme['Theme Root URI']; 174 } 175 176 $template_dir_uri = "$theme_root_uri/$template"; 177 return apply_filters( 'template_directory_uri', $template_dir_uri, $template, $theme_root_uri ); 142 178 } 143 179 144 180 /** … … 253 289 if ( isset($wp_themes) ) 254 290 return $wp_themes; 255 291 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); 292 /* Register wp-content/themes as a theme directory */ 293 register_theme_directory( 'themes' ); 261 294 262 // Files in wp-content/themes directory and one subdir down 263 $themes_dir = @ opendir($theme_root); 264 if ( !$themes_dir ) 295 if ( !$theme_files = search_theme_directories() ) 265 296 return false; 297 298 asort( $theme_files ); 299 300 foreach ( (array) $theme_files as $theme_file ) { 301 $theme_root = $theme_file['theme_root']; 302 $theme_file = $theme_file['theme_file']; 266 303 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 304 if ( !is_readable("$theme_root/$theme_file") ) { 316 305 $wp_broken_themes[$theme_file] = array('Name' => $theme_file, 'Title' => $theme_file, 'Description' => __('File not readable.')); 317 306 continue; … … 346 335 else 347 336 continue; 348 337 } 338 339 $template = trim( $template ); 349 340 350 $template = trim($template);351 352 341 if ( !file_exists("$theme_root/$template/index.php") ) { 353 342 $parent_dir = dirname(dirname($theme_file)); 354 343 if ( file_exists("$theme_root/$parent_dir/$template/index.php") ) { 355 $template = "$ parent_dir/$template";344 $template = "$theme_root/$parent_dir/$template"; 356 345 } else { 357 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); 358 continue; 346 /** 347 * The parent theme doesn't exist in the current theme's folder or sub folder 348 * so lets use the theme root for the parent template. 349 */ 350 $parent_theme_root = $theme_files[$template]['theme_root']; 351 if ( file_exists( "$parent_theme_root/$template/index.php" ) ) { 352 $template = "$parent_theme_root/$template"; 353 } else { 354 $wp_broken_themes[$name] = array('Name' => $name, 'Title' => $title, 'Description' => __('Template is missing.')); 355 continue; 356 } 357 359 358 } 359 } else { 360 $template = trim( $theme_root . '/' . $template ); 360 361 } 361 362 362 363 $stylesheet_files = array(); 363 364 $template_files = array(); 364 365 … … 367 368 while ( ($file = $stylesheet_dir->read()) !== false ) { 368 369 if ( !preg_match('|^\.+$|', $file) ) { 369 370 if ( preg_match('|\.css$|', $file) ) 370 $stylesheet_files[] = "$theme_ loc/$stylesheet/$file";371 $stylesheet_files[] = "$theme_root/$stylesheet/$file"; 371 372 elseif ( preg_match('|\.php$|', $file) ) 372 $template_files[] = "$theme_ loc/$stylesheet/$file";373 $template_files[] = "$theme_root/$stylesheet/$file"; 373 374 } 374 375 } 375 376 @ $stylesheet_dir->close(); 376 377 } 377 378 378 $template_dir = @ dir("$t heme_root/$template");379 $template_dir = @ dir("$template"); 379 380 if ( $template_dir ) { 380 381 while ( ($file = $template_dir->read()) !== false ) { 381 382 if ( preg_match('|^\.+$|', $file) ) 382 383 continue; 383 384 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");385 $template_files[] = "$template/$file"; 386 } elseif ( is_dir("$template/$file") ) { 387 $template_subdir = @ dir("$template/$file"); 387 388 while ( ($subfile = $template_subdir->read()) !== false ) { 388 389 if ( preg_match('|^\.+$|', $subfile) ) 389 390 continue; 390 391 if ( preg_match('|\.php$|', $subfile) ) 391 $template_files[] = "$t heme_loc/$template/$file/$subfile";392 $template_files[] = "$template/$file/$subfile"; 392 393 } 393 394 @ $template_subdir->close(); 394 395 } … … 422 423 } 423 424 } 424 425 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']);426 $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 427 } 427 428 428 429 // Resolve theme dependencies. … … 441 442 } 442 443 443 444 $wp_themes = $themes; 444 445 445 446 return $themes; 446 447 } 447 448 … … 499 500 } 500 501 501 502 /** 503 * Register a directory that contains themes relative to the content directory. 504 * 505 * @since 2.9.0 506 * 507 * @return bool 508 */ 509 function register_theme_directory( $directory ) { 510 global $wp_theme_directories; 511 512 /* The theme directory should be relative to the content directory */ 513 $registered_directory = WP_CONTENT_DIR . '/' . $directory; 514 515 /* If this folder does not exist, return and do not register */ 516 if ( !file_exists( $registered_directory ) ) 517 return false; 518 519 $wp_theme_directories[] = $registered_directory; 520 521 return true; 522 } 523 524 /** 525 * Search all registered theme directories for complete and valid themes. 526 * 527 * @since 2.9.0 528 * 529 * @return array Valid themes found 530 */ 531 function search_theme_directories() { 532 global $wp_theme_directories; 533 global $wp_broken_themes; 534 535 if ( empty( $wp_theme_directories ) ) 536 return false; 537 538 $themes = array(); 539 $wp_broken_themes = array(); 540 541 /* Loop the registered theme directories and extract all themes */ 542 foreach ( (array) $wp_theme_directories as $theme_root ) { 543 $theme_loc = $theme_root; 544 545 /* We don't want to replace all forward slashes, see Trac #4541 */ 546 if ( '/' != WP_CONTENT_DIR ) 547 $theme_loc = str_replace(WP_CONTENT_DIR, '', $theme_root); 548 549 /* Files in the root of the current theme directory and one subdir down */ 550 $themes_dir = @ opendir($theme_root); 551 552 if ( !$themes_dir ) 553 return false; 554 555 while ( ($theme_dir = readdir($themes_dir)) !== false ) { 556 if ( is_dir($theme_root . '/' . $theme_dir) && is_readable($theme_root . '/' . $theme_dir) ) { 557 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) 558 continue; 559 560 $stylish_dir = @ opendir($theme_root . '/' . $theme_dir); 561 $found_stylesheet = false; 562 563 while ( ($theme_file = readdir($stylish_dir)) !== false ) { 564 if ( $theme_file == 'style.css' ) { 565 $theme_files[$theme_dir] = array( 'theme_file' => $theme_dir . '/' . $theme_file, 'theme_root' => $theme_root ); 566 $found_stylesheet = true; 567 break; 568 } 569 } 570 @closedir($stylish_dir); 571 572 if ( !$found_stylesheet ) { // look for themes in that dir 573 $subdir = "$theme_root/$theme_dir"; 574 $subdir_name = $theme_dir; 575 $theme_subdir = @ opendir( $subdir ); 576 577 while ( ($theme_dir = readdir($theme_subdir)) !== false ) { 578 if ( is_dir( $subdir . '/' . $theme_dir) && is_readable($subdir . '/' . $theme_dir) ) { 579 if ( $theme_dir{0} == '.' || $theme_dir == '..' || $theme_dir == 'CVS' ) 580 continue; 581 582 $stylish_dir = @ opendir($subdir . '/' . $theme_dir); 583 $found_stylesheet = false; 584 585 while ( ($theme_file = readdir($stylish_dir)) !== false ) { 586 if ( $theme_file == 'style.css' ) { 587 $theme_files[$theme_dir] = array( 'theme_file' => $subdir_name . '/' . $theme_dir . '/' . $theme_file, 'theme_root' => $theme_root ); 588 $found_stylesheet = true; 589 break; 590 } 591 } 592 @closedir($stylish_dir); 593 } 594 } 595 @closedir($theme_subdir); 596 597 $wp_broken_themes[$theme_dir] = array('Name' => $theme_dir, 'Title' => $theme_dir, 'Description' => __('Stylesheet is missing.')); 598 } 599 } 600 } 601 if ( is_dir( $theme_dir ) ) 602 @closedir( $theme_dir ); 603 } 604 605 return $theme_files; 606 } 607 608 /** 502 609 * Retrieve path to themes directory. 503 610 * 504 611 * Does not have trailing slash. -
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 -
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>