Merge remote-tracking branch 'upstream/master'

2011-09-25 13:30:55 -05:00
parent cb1c6dd1e3 6a9e22550d
commit 3426ce5f94
10 changed files with 2 additions and 419 deletions
--- a/include/text.php
+++ b/include/text.php
@@ -925,9 +925,6 @@ function base64url_decode($s) {
 	return base64_decode(strtr($s,'-_','+/'));
 }

-function cc_license() {
-return '<div class="cc-license">' . t('Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.') . '</div>';
-}

 if (!function_exists('str_getcsv')) {
    function str_getcsv($input, $delimiter = ',', $enclosure = '"', $escape = '\\', $eol = '\n') {