summaryrefslogtreecommitdiff
path: root/includes/common.inc
diff options
context:
space:
mode:
Diffstat (limited to 'includes/common.inc')
-rw-r--r--includes/common.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/includes/common.inc b/includes/common.inc
index d7ae5ae63..bccc4ce5d 100644
--- a/includes/common.inc
+++ b/includes/common.inc
@@ -225,6 +225,14 @@ function field_set($string, $name, $value) {
return $rval;
}
+function field_merge($a, $b) {
+ foreach (explode(";", $b) as $data) {
+ $entry = explode(":", $data);
+ $a = field_set($a, $entry[0], $entry[1]);
+ }
+ return $a;
+}
+
function timer_start() {
global $timer;
$timer = explode(" ", microtime());