aboutsummaryrefslogtreecommitdiff
path: root/ratatoeskr/sys
diff options
context:
space:
mode:
authorKevin Chabowski <kevin@kch42.de>2012-01-08 14:27:48 +0100
committerKevin Chabowski <kevin@kch42.de>2012-01-08 14:27:48 +0100
commit5fc635f7bba37e47054faa2ecc2cc246d7d16f6a (patch)
tree084c80ab951f80c71cd29cc6498b81eda3551d38 /ratatoeskr/sys
parent2b74984974b8363aa2bf197fb1d3950f7425a878 (diff)
downloadratatoeskr-cms-5fc635f7bba37e47054faa2ecc2cc246d7d16f6a.tar.gz
ratatoeskr-cms-5fc635f7bba37e47054faa2ecc2cc246d7d16f6a.tar.bz2
ratatoeskr-cms-5fc635f7bba37e47054faa2ecc2cc246d7d16f6a.zip
Fixed some plugin related bugs.
* Plugin backend pages did not work. * Plugin author was not transferred to database.
Diffstat (limited to 'ratatoeskr/sys')
-rw-r--r--ratatoeskr/sys/models.php2
-rw-r--r--ratatoeskr/sys/plugin_api.php4
-rw-r--r--ratatoeskr/sys/urlprocess.php2
3 files changed, 4 insertions, 4 deletions
diff --git a/ratatoeskr/sys/models.php b/ratatoeskr/sys/models.php
index d371f9f..02fa0fc 100644
--- a/ratatoeskr/sys/models.php
+++ b/ratatoeskr/sys/models.php
@@ -1285,7 +1285,7 @@ class Plugin extends BySQLRowEnabled
if(!empty($pkg->custompriv))
array2dir($pkg->custompriv, dirname(__FILE__) . "/../plugin_extradata/private/" . $this->get_id());
if(!empty($pkg->tpls))
- array2dir($pkg->tpls, dirname(__FILE__) . "/../templates/srv/plugintemplates/" . $this->get_id());
+ array2dir($pkg->tpls, dirname(__FILE__) . "/../templates/src/plugintemplates/" . $this->get_id());
}
protected function populate_by_sqlrow($sqlrow)
diff --git a/ratatoeskr/sys/plugin_api.php b/ratatoeskr/sys/plugin_api.php
index 797f42d..7a80a5b 100644
--- a/ratatoeskr/sys/plugin_api.php
+++ b/ratatoeskr/sys/plugin_api.php
@@ -168,13 +168,13 @@ abstract class RatatoeskrPlugin
global $pluginpages_handlers;
$this->ste->vars["pluginpages"][$this->id] = $label;
- sort($this->ste->vars["pluginpages"]);
+ asort($this->ste->vars["pluginpages"]);
$pluginid = $this->id;
$pluginpages_handlers["p{$this->id}"] = function(&$data, $url_now, &$url_next) use($pluginid, $fx)
{
global $ste, $rel_path_to_root;
$ste->vars["rel_path_to_pluginpage"] = "$rel_path_to_root/backend/pluginpages/p$pluginid";
- $rv = $fx($data, $url_now, $url_next);
+ $rv = call_user_func_array($fx, array(&$data, $url_now, &$url_next));
unset($ste->vars["rel_path_to_pluginpage"]);
return $rv;
};
diff --git a/ratatoeskr/sys/urlprocess.php b/ratatoeskr/sys/urlprocess.php
index 14d67c1..d3c5edb 100644
--- a/ratatoeskr/sys/urlprocess.php
+++ b/ratatoeskr/sys/urlprocess.php
@@ -124,7 +124,7 @@ function url_process($url, $actions, &$data)
try
{
- $cb($data, $url_now, $url_next);
+ call_user_func_array($cb, array(&$data, $url_now, &$url_next));
}
catch(NotFoundError $e)
{