Changeset 21699 for branches/3.4/wp-includes/class-wp-theme.php
- Timestamp:
- 09/03/2012 06:11:42 PM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/3.4/wp-includes/class-wp-theme.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/wp-includes/class-wp-theme.php merged eligible /branches/3.1/wp-includes/class-wp-theme.php 18031 /branches/3.3/wp-includes/class-wp-theme.php 20543
r21615 r21699 1072 1072 */ 1073 1073 public static function get_allowed( $blog_id = null ) { 1074 return self::get_allowed_on_network() + self::get_allowed_on_site( $blog_id ); 1074 $network = (array) apply_filters( 'allowed_themes', self::get_allowed_on_network() ); 1075 return $network + self::get_allowed_on_site( $blog_id ); 1075 1076 } 1076 1077 -
Property
svn:mergeinfo
set to
(toggle deleted branches)
Note: See TracChangeset
for help on using the changeset viewer.