summaryrefslogtreecommitdiff
path: root/lib/common.php
diff options
context:
space:
mode:
authorZach Copley <zach@controlyourself.ca>2009-06-21 22:30:39 -0700
committerZach Copley <zach@controlyourself.ca>2009-06-21 22:30:39 -0700
commit9014a0a90d9ab5ee408aded51f379fd084fcd82c (patch)
treec30dea6917805d3218f030fc59185f00841e3abc /lib/common.php
parentb8f3f32f3f12339c3838fcfc883815d63a36dca7 (diff)
parent876ab059273a5f223170d6b2c0b9b4342b06c50f (diff)
Merge branch '0.8.x' of git@gitorious.org:laconica/dev into 0.8.x
* '0.8.x' of git@gitorious.org:laconica/dev: Add like for search got rid of 'skin' concept a while ago add collecta.com link Update copyright dates in files modified in 2009 change Controlez-Vous to Control Yourself ignore config.php.* Position of max_file_size position helps IE
Diffstat (limited to 'lib/common.php')
-rw-r--r--lib/common.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/common.php b/lib/common.php
index 702da8235..14f5c7a7f 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -1,7 +1,7 @@
<?php
/*
* Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * Copyright (C) 2008, 2009, Control Yourself, Inc.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
@@ -83,7 +83,6 @@ $config =
array('name' => 'Just another Laconica microblog',
'server' => $_server,
'theme' => 'default',
- 'skin' => 'default',
'design' =>
array('backgroundcolor' => '#F0F2F5',
'contentcolor' => '#FFFFFF',
@@ -229,7 +228,9 @@ $config =
),
'group' =>
array('maxaliases' => 3),
- 'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/')
+ 'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/'),
+ 'search' =>
+ array('type' => 'fulltext'),
);
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');