ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.119 by root, Wed Jan 4 02:48:57 2012 UTC vs.
Revision 1.120 by root, Wed Jan 4 03:22:28 2012 UTC

761 $meta = { 761 $meta = {
762 %{ $meta->{"" } || {} }, 762 %{ $meta->{"" } || {} },
763 %{ $meta->{$file} || {} }, 763 %{ $meta->{$file} || {} },
764 }; 764 };
765 765
766 if ($meta->{license} =~ s/^#//) { 766 if (exists $meta->{license} && $meta->{license} =~ s/^#//) { # exists == avoid autovivification
767 $meta->{license} = ({ 767 $meta->{license} = ({
768 "pd" => "Public Domain", 768 "pd" => "Public Domain",
769 "gpl" => "GNU General Public License, version 3.0 or any later", 769 "gpl" => "GNU General Public License, version 3.0 or any later",
770 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/", 770 "cc/by/2.0" => "Licensed under Creative Commons Attribution 2.0 http://creativecommons.org/licenses/by/2.0/",
771 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/", 771 "cc/by/2.1" => "Licensed under Creative Commons Attribution 2.1 http://creativecommons.org/licenses/by/2.1/",

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines