summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin Millette <millette@controlyourself.ca>2009-06-17 16:44:33 -0400
committerRobin Millette <millette@controlyourself.ca>2009-06-17 16:44:33 -0400
commit28d02ec8cdd0278c802c8fee30acddecca9ca01f (patch)
tree63a83ad1e293905478bddd2677be56454649925e
parentfd6de17a4ace3eece968e2c7d319ee29340d2930 (diff)
Make oohembed endpoint configurable.
-rw-r--r--README8
-rw-r--r--classes/File_oembed.php2
-rw-r--r--config.php.sample1
-rw-r--r--lib/common.php1
4 files changed, 11 insertions, 1 deletions
diff --git a/README b/README
index 3279f7bba..7b22e3c5e 100644
--- a/README
+++ b/README
@@ -1246,6 +1246,14 @@ Options for group functionality.
maxaliases: maximum number of aliases a group can have. Default 3. Set
to 0 or less to prevent aliases in a group.
+
+oohembed
+--------
+
+oEmbed endpoint for multimedia attachments (links in posts).
+
+endpoint: oohembed endpoint using http://oohembed.com/ software.
+
Troubleshooting
===============
diff --git a/classes/File_oembed.php b/classes/File_oembed.php
index f1b2cb13c..6bf972f8f 100644
--- a/classes/File_oembed.php
+++ b/classes/File_oembed.php
@@ -53,7 +53,7 @@ class File_oembed extends Memcached_DataObject
function _getOembed($url, $maxwidth = 500, $maxheight = 400, $format = 'json') {
- $cmd = 'http://oohembed.com/oohembed/?url=' . urlencode($url);
+ $cmd = common_config('oohembed', 'endpoint') . '?url=' . urlencode($url);
if (is_int($maxwidth)) $cmd .= "&maxwidth=$maxwidth";
if (is_int($maxheight)) $cmd .= "&maxheight=$maxheight";
if (is_string($format)) $cmd .= "&format=$format";
diff --git a/config.php.sample b/config.php.sample
index 636f4cf8e..ed70f85fb 100644
--- a/config.php.sample
+++ b/config.php.sample
@@ -223,3 +223,4 @@ $config['sphinx']['port'] = 3312;
// $config['attachments']['user_quota'] = 50000000;
// $config['attachments']['monthly_quota'] = 15000000;
+// $config['oohembed']['endpoint'] = 'http://oohembed.com/oohembed/';
diff --git a/lib/common.php b/lib/common.php
index 51204cede..9c015a15d 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -203,6 +203,7 @@ $config =
),
'group' =>
array('maxaliases' => 3),
+ 'oohembed' => array('endpoint' => 'http://oohembed.com/oohembed/')
);
$config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');