mirror of
https://framagit.org/hubzilla/core.git
synced 2026-06-21 00:52:33 -04:00
fix issue in route and widget unregister: we should remove only if both arguments are different. Also only register routes and widgets if they are not yet registered
This commit is contained in:
@@ -8,6 +8,13 @@ class Route {
|
|||||||
|
|
||||||
static function register($file,$modname) {
|
static function register($file,$modname) {
|
||||||
$rt = self::get();
|
$rt = self::get();
|
||||||
|
|
||||||
|
foreach ($rt as $r) {
|
||||||
|
if ($r[0] === $file && $r[1] === $modname) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$rt[] = [ $file, $modname ];
|
$rt[] = [ $file, $modname ];
|
||||||
self::set($rt);
|
self::set($rt);
|
||||||
}
|
}
|
||||||
@@ -17,7 +24,7 @@ class Route {
|
|||||||
if($rt) {
|
if($rt) {
|
||||||
$n = [];
|
$n = [];
|
||||||
foreach($rt as $r) {
|
foreach($rt as $r) {
|
||||||
if($r[0] !== $file && $r[1] !== $modname) {
|
if(!($r[0] === $file && $r[1] === $modname)) {
|
||||||
$n[] = $r;
|
$n[] = $r;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -8,6 +8,13 @@ class Widget {
|
|||||||
|
|
||||||
static function register($file,$widget) {
|
static function register($file,$widget) {
|
||||||
$rt = self::get();
|
$rt = self::get();
|
||||||
|
|
||||||
|
foreach ($rt as $r) {
|
||||||
|
if ($r[0] === $file && $r[1] === $widget) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
$rt[] = [ $file, $widget ];
|
$rt[] = [ $file, $widget ];
|
||||||
self::set($rt);
|
self::set($rt);
|
||||||
}
|
}
|
||||||
@@ -17,7 +24,7 @@ class Widget {
|
|||||||
if($rt) {
|
if($rt) {
|
||||||
$n = [];
|
$n = [];
|
||||||
foreach($rt as $r) {
|
foreach($rt as $r) {
|
||||||
if($r[0] !== $file && $r[1] !== $widget) {
|
if(!($r[0] === $file && $r[1] === $widget)) {
|
||||||
$n[] = $r;
|
$n[] = $r;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user