[cc-commits] [CC SVN] r11432 - in cc.engine/branches/production: . cc/engine/licenses

webmaster at creativecommons.org webmaster at creativecommons.org
Fri Dec 19 16:46:17 EST 2008


Author: nkinkade
Date: 2008-12-19 21:46:17 +0000 (Fri, 19 Dec 2008)
New Revision: 11432

Modified:
   cc.engine/branches/production/
   cc.engine/branches/production/cc/engine/licenses/catalog.py
Log:
Merged revisions 11430 via svnmerge from 
svn+ssh://svn@code.creativecommons.org/svnroot/cc.engine/trunk

........
  r11430 | nkinkade | 2008-12-19 16:31:27 -0500 (Fri, 19 Dec 2008) | 1 line
  
  Fixed deed template dispatcher to catch all sampling licenses, not just ones that begin with the word 'sampling'
........



Property changes on: cc.engine/branches/production
___________________________________________________________________
Modified: svnmerge-integrated
   - /cc.engine/trunk:1-6977,6986-7568,7662-7664,7666-7886,7916-7917,7923-8021,8121-8122,8125-8180,8183-8198,8202-8230,8232-8236,8238-8240,8242-8256,8258-8274,8276-8277,8279,8282-8285,8287,8289-8293,8296-8303,8305-8309,8312-8313,8427,8488,8549,8803-9051,9101-9106,9143,9147,9170,9395,9464-9502,9504-9611,9613-9822,9838-10708,10713-10714,11223,11310,11413

   + /cc.engine/trunk:1-6977,6986-7568,7662-7664,7666-7886,7916-7917,7923-8021,8121-8122,8125-8180,8183-8198,8202-8230,8232-8236,8238-8240,8242-8256,8258-8274,8276-8277,8279,8282-8285,8287,8289-8293,8296-8303,8305-8309,8312-8313,8427,8488,8549,8803-9051,9101-9106,9143,9147,9170,9395,9464-9502,9504-9611,9613-9822,9838-10708,10713-10714,11223,11310,11413,11430

Modified: cc.engine/branches/production/cc/engine/licenses/catalog.py
===================================================================
--- cc.engine/branches/production/cc/engine/licenses/catalog.py	2008-12-19 21:41:44 UTC (rev 11431)
+++ cc.engine/branches/production/cc/engine/licenses/catalog.py	2008-12-19 21:46:17 UTC (rev 11432)
@@ -37,7 +37,7 @@
             return self.CUSTOM_DEEDS[code](self, [code])
 
         # check for sampling
-        if code.find('sampling') == 0:
+        if code.find('sampling') >= 0:
             return SamplingLicense(self, [code])
         
         return BrowserLicense(self, [code])




More information about the cc-commits mailing list