[cc-commits] [CC SVN] r12714 - in ccwordpress/branches/production: . www/wp-includes
webmaster at creativecommons.org
webmaster at creativecommons.org
Wed Jun 3 19:12:05 EDT 2009
Author: nkinkade
Date: 2009-06-03 23:12:05 +0000 (Wed, 03 Jun 2009)
New Revision: 12714
Modified:
ccwordpress/branches/production/
ccwordpress/branches/production/www/wp-includes/template-loader.php
Log:
Merged revisions 12713 via svnmerge from
svn+ssh://svn@code.creativecommons.org/svnroot/ccwordpress/trunk
........
r12713 | nkinkade | 2009-06-03 18:02:40 -0500 (Wed, 03 Jun 2009) | 1 line
If a post is in a category of Weblog and International, respect the Weblog category.
........
Property changes on: ccwordpress/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
- /ccwordpress/trunk:1-8296,8298-9115,9117-9643,9645-9659,9661-9687,9689-9733,9736-9759,9761-9839,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10638,10640-10734,10736,10740-11077,11079-11279,11281-11284,11286-11366,11368-11544,11561,11571,11573,11578,11581,11587,11649,11651-11940,11943,11945-12117,12120,12122,12168,12226,12348-12449,12454,12456,12484-12485,12520,12579,12600-12603,12605-12616,12655-12657,12679
+ /ccwordpress/trunk:1-8296,8298-9115,9117-9643,9645-9659,9661-9687,9689-9733,9736-9759,9761-9839,9841-9901,9903-9920,9922-10049,10051-10061,10063-10087,10093-10094,10096-10164,10166-10173,10175-10638,10640-10734,10736,10740-11077,11079-11279,11281-11284,11286-11366,11368-11544,11561,11571,11573,11578,11581,11587,11649,11651-11940,11943,11945-12117,12120,12122,12168,12226,12348-12449,12454,12456,12484-12485,12520,12579,12600-12603,12605-12616,12655-12657,12679,12713
Modified: ccwordpress/branches/production/www/wp-includes/template-loader.php
===================================================================
--- ccwordpress/branches/production/www/wp-includes/template-loader.php 2009-06-03 23:02:40 UTC (rev 12713)
+++ ccwordpress/branches/production/www/wp-includes/template-loader.php 2009-06-03 23:12:05 UTC (rev 12714)
@@ -37,7 +37,7 @@
include($template);
return;
# Workaround to make /international/xx/ get the right template
- } else if ( !is_category("international") && in_category(21) && $template = get_single_template() ) {
+ } else if ( !is_category("Weblog") && !is_category("international") && in_category(21) && $template = get_single_template() ) {
# Category #21 is "international"
include($template);
exit;
More information about the cc-commits
mailing list