diff options
| author | Evan Prodromou <evan@status.net> | 2010-01-19 00:31:42 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-01-19 00:31:42 -0500 |
| commit | 01dc77c2fd783f8b7ff796ca06013804971c8f5e (patch) | |
| tree | 4874bddd23ac870d8ea9bfff5c4d0479ef67bbad /lib/default.php | |
| parent | 1f6bbc189012cb3a1d61be92bbc1d4ec6156afac (diff) | |
| parent | c7f14cd7774d21e16aa6b020da71f318c648e3f0 (diff) | |
Merge branch 'master' into 0.9.x
Diffstat (limited to 'lib/default.php')
| -rw-r--r-- | lib/default.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/default.php b/lib/default.php index 82578fea8..1c3c5e7ff 100644 --- a/lib/default.php +++ b/lib/default.php @@ -83,7 +83,9 @@ $default = 'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully ), 'license' => - array('url' => 'http://creativecommons.org/licenses/by/3.0/', + array('type' => 'cc', # can be 'cc', 'allrightsreserved', 'private' + 'owner' => null, # can be name of content owner e.g. for enterprise + 'url' => 'http://creativecommons.org/licenses/by/3.0/', 'title' => 'Creative Commons Attribution 3.0', 'image' => 'http://i.creativecommons.org/l/by/3.0/80x15.png'), 'mail' => |