Commit 604e65e7 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "Dwoo_Plugin_theme_{path,url} don't work if plugin location specified (bug #911683)"

parents af9e6e57 901b2761
......@@ -15,12 +15,7 @@ function Dwoo_Plugin_theme_path(Dwoo $dwoo, $location, $pluginlocation=null) {
global $THEME;
log_warn("The dwoo modifier theme_path is deprecated: please use theme_url");
$plugintype = $pluginname = '';
if ($pluginlocation) {
list($plugintype, $pluginname) = explode('/', $pluginlocation);
}
return $THEME->get_url($location, false, $plugintype, $pluginname);
return $THEME->get_url($location, false, $pluginlocation);
}
?>
......@@ -9,12 +9,7 @@
function Dwoo_Plugin_theme_url(Dwoo $dwoo, $filename, $plugin = null) {
global $THEME;
$plugintype = $pluginname = '';
if ($plugin) {
list($plugintype, $pluginname) = explode('/', $plugin);
}
return $THEME->get_url($filename, false, $plugintype, $pluginname);
return $THEME->get_url($filename, false, $plugin);
}
?>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment