aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2019-03-08 12:32:20 +0100
committerMario Vavti <mario@mariovavti.com>2019-03-08 12:32:20 +0100
commit97727260651a76b5b67568925b0fe0d5b688ce0c (patch)
treef0cddb38c82b91929a18a4178d13932479f16c02
parent8ecdde6cb573ace776b472046388bb046dc59451 (diff)
downloadvolse-hubzilla-4.0.tar.gz
volse-hubzilla-4.0.tar.bz2
volse-hubzilla-4.0.zip
merge text.php and hmessages.po4.0
-rw-r--r--include/text.php22
-rw-r--r--util/hmessages.po2
2 files changed, 1 insertions, 23 deletions
diff --git a/include/text.php b/include/text.php
index 80ed7d6db..ec3eb7b10 100644
--- a/include/text.php
+++ b/include/text.php
@@ -3331,28 +3331,6 @@ function array2XML($obj, $array) {
}
}
-function array_path_exists($str,$arr) {
-
- $ptr = $arr;
- $search = explode('/', $str);
-
- if($search) {
- foreach($search as $s) {
- if(array_key_exists($s,$ptr)) {
- $ptr = $ptr[$s];
- }
- else {
- return false;
- }
- }
- return true;
- }
-
- return false;
-
-}
-
-
/**
* @brief Inserts an array into $table.
*
diff --git a/util/hmessages.po b/util/hmessages.po
index a4f6dd588..91cc1f191 100644
--- a/util/hmessages.po
+++ b/util/hmessages.po
@@ -13375,7 +13375,7 @@ msgid ""
"Cannot create a duplicate channel identifier on this system. Import failed."
msgstr ""
-#: ../../include/import.php:116
+#: ../../include/import.php:117
msgid "Cloned channel not found. Import failed."
msgstr ""