projects
/
core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added option parameter 'forceInit'
[core.git]
/
inc
/
classes
/
main
/
class_BaseFrameworkSystem.php
diff --git
a/inc/classes/main/class_BaseFrameworkSystem.php
b/inc/classes/main/class_BaseFrameworkSystem.php
index b48b030c84fd7d0926897c39993a0fc580b4055a..0fb474dcb865fafa32ceb60749b6428817b2439b 100644
(file)
--- a/
inc/classes/main/class_BaseFrameworkSystem.php
+++ b/
inc/classes/main/class_BaseFrameworkSystem.php
@@
-2225,11
+2225,12
@@
class BaseFrameworkSystem extends stdClass implements FrameworkInterface {
* @param $keyGroup Main group for the key
* @param $subGroup Sub group for the key
* @param $key Key to use
* @param $keyGroup Main group for the key
* @param $subGroup Sub group for the key
* @param $key Key to use
+ * @param $forceInit Optionally force initialization
* @return void
*/
* @return void
*/
- protected final function initGenericArray ($keyGroup, $subGroup, $key) {
+ protected final function initGenericArray ($keyGroup, $subGroup, $key
, $forceInit = FALSE
) {
// Is it already set?
// Is it already set?
- if (
$this->isGenericArrayKeySet($keyGroup, $subGroup, $key
)) {
+ if (
($forceInit === FALSE) && ($this->isGenericArrayKeySet($keyGroup, $subGroup, $key)
)) {
// Already initialized
trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' already initialized.');
} // END - if
// Already initialized
trigger_error(__METHOD__ . ':keyGroup=' . $keyGroup . ',subGroup=' . $subGroup . ',key=' . $key . ' already initialized.');
} // END - if