From 8ba7e8cb76a67468f8eaf36e7dcd64cebfed396d Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Fri, 13 Jun 2008 13:53:44 -0400 Subject: [PATCH] function for retrieving a config variable darcs-hash:20080613175344-84dde-253b5b55ea8ae85b807cba2e23ea885c6bbb0b8f.gz --- actions/doc.php | 2 +- lib/util.php | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/actions/doc.php b/actions/doc.php index a23cf9ad07..edb2cab620 100644 --- a/actions/doc.php +++ b/actions/doc.php @@ -34,7 +34,7 @@ class DocAction extends Action { $c = file_get_contents($filename); $c = preg_replace('/%%action.(\w+)%%/e', "common_local_url('\\1')", $c); $c = preg_replace('/%%doc.(\w+)%%/e', "common_local_url('doc', array('title'=>'\\1'))", $c); - $c = preg_replace('/%%(\w+).(\w+)%%/e', '$config[\'\\1\'][\'\\2\']', $c); + $c = preg_replace('/%%(\w+).(\w+)%%/e', 'common_config(\'\\1\', \'\\2\')', $c); $output = Markdown($c); common_show_header(_t(ucfirst($title))); common_raw($output); diff --git a/lib/util.php b/lib/util.php index 4869d4dfdd..a630646d7c 100644 --- a/lib/util.php +++ b/lib/util.php @@ -833,3 +833,8 @@ function common_negotiate_type($cprefs, $sprefs) { return $besttype; } + +function common_config($main, $sub) { + global $config; + return $config[$main][$sub]; +}