summaryrefslogtreecommitdiff
path: root/includes/functions
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2015-02-05 08:31:15 +0000
committerGreg Roach <fisharebest@gmail.com>2015-02-05 08:31:15 +0000
commitdd04c183d8beed05be2226b30b7dda485ea4538a (patch)
treee3f9ed591264105c5f692b5e10cb79449a3ce3c1 /includes/functions
parent3be3dabd99a20c9582afa24d09fbb2e9485d1a9e (diff)
downloadwebtrees-dd04c183d8beed05be2226b30b7dda485ea4538a.tar.gz
webtrees-dd04c183d8beed05be2226b30b7dda485ea4538a.tar.bz2
webtrees-dd04c183d8beed05be2226b30b7dda485ea4538a.zip
Namespaces should consist of both vendor and package
Diffstat (limited to 'includes/functions')
-rw-r--r--includes/functions/functions.php8
-rw-r--r--includes/functions/functions_charts.php2
-rw-r--r--includes/functions/functions_date.php2
-rw-r--r--includes/functions/functions_db.php10
-rw-r--r--includes/functions/functions_edit.php2
-rw-r--r--includes/functions/functions_export.php2
-rw-r--r--includes/functions/functions_import.php2
-rw-r--r--includes/functions/functions_mediadb.php2
-rw-r--r--includes/functions/functions_print.php2
-rw-r--r--includes/functions/functions_print_facts.php2
-rw-r--r--includes/functions/functions_print_lists.php8
-rw-r--r--includes/functions/functions_rtl.php2
12 files changed, 22 insertions, 22 deletions
diff --git a/includes/functions/functions.php b/includes/functions/functions.php
index b3a4932f66..e365992f31 100644
--- a/includes/functions/functions.php
+++ b/includes/functions/functions.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
@@ -313,8 +313,8 @@ function sort_facts(&$arr) {
}
//-- sort each type of array
- usort($dated, 'Webtrees\Fact::compareDate');
- usort($nondated, 'Webtrees\Fact::compareType');
+ usort($dated, __NAMESPACE__ . '\Fact::compareDate');
+ usort($nondated, __NAMESPACE__ . '\Fact::compareType');
//-- merge the arrays back together comparing by Facts
$dc = count($dated);
@@ -2356,7 +2356,7 @@ function get_theme_names() {
}
}
$d->close();
- uksort($themes, 'Webtrees\I18N::strcasecmp');
+ uksort($themes, __NAMESPACE__ . '\I18N::strcasecmp');
}
return $themes;
diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php
index 790cc92cf5..44ce0fc27c 100644
--- a/includes/functions/functions_charts.php
+++ b/includes/functions/functions_charts.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_date.php b/includes/functions/functions_date.php
index dbf1aefed9..e73581a481 100644
--- a/includes/functions/functions_date.php
+++ b/includes/functions/functions_date.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_db.php b/includes/functions/functions_db.php
index aab5b0e2ce..284329187c 100644
--- a/includes/functions/functions_db.php
+++ b/includes/functions/functions_db.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
@@ -86,7 +86,7 @@ function get_source_list($ged_id) {
foreach ($rows as $row) {
$list[] = Source::getInstance($row->xref, $row->gedcom_id, $row->gedcom);
}
- usort($list, 'Webtrees\GedcomRecord::compare');
+ usort($list, __NAMESPACE__ . '\GedcomRecord::compare');
return $list;
}
@@ -107,7 +107,7 @@ function get_repo_list($ged_id) {
foreach ($rows as $row) {
$list[] = Repository::getInstance($row->xref, $row->gedcom_id, $row->gedcom);
}
- usort($list, 'Webtrees\GedcomRecord::compare');
+ usort($list, __NAMESPACE__ . '\GedcomRecord::compare');
return $list;
}
@@ -128,7 +128,7 @@ function get_note_list($ged_id) {
foreach ($rows as $row) {
$list[] = Note::getInstance($row->xref, $row->gedcom_id, $row->gedcom);
}
- usort($list, 'Webtrees\GedcomRecord::compare');
+ usort($list, __NAMESPACE__ . '\GedcomRecord::compare');
return $list;
}
@@ -827,7 +827,7 @@ function get_common_surnames($min) {
if (empty($topsurns) && $min > 2) {
return get_common_surnames($min / 2);
} else {
- uksort($topsurns, 'Webtrees\I18N::strcasecmp');
+ uksort($topsurns, __NAMESPACE__ . '\I18N::strcasecmp');
foreach ($topsurns as $key => $value) {
$topsurns[$key] = array('name' => $key, 'match' => $value);
}
diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php
index e441573e55..5c7b3b69cd 100644
--- a/includes/functions/functions_edit.php
+++ b/includes/functions/functions_edit.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_export.php b/includes/functions/functions_export.php
index ce9254a729..08eb1a6fcf 100644
--- a/includes/functions/functions_export.php
+++ b/includes/functions/functions_export.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_import.php b/includes/functions/functions_import.php
index cd793dc45e..65a8b723cf 100644
--- a/includes/functions/functions_import.php
+++ b/includes/functions/functions_import.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_mediadb.php b/includes/functions/functions_mediadb.php
index 142208e102..382fed9e52 100644
--- a/includes/functions/functions_mediadb.php
+++ b/includes/functions/functions_mediadb.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php
index e2dc46801e..0474455bd7 100644
--- a/includes/functions/functions_print.php
+++ b/includes/functions/functions_print.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php
index 5bb32bb73d..738b354239 100644
--- a/includes/functions/functions_print_facts.php
+++ b/includes/functions/functions_print_facts.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
diff --git a/includes/functions/functions_print_lists.php b/includes/functions/functions_print_lists.php
index cfd6db2d4b..5d6dff1ed6 100644
--- a/includes/functions/functions_print_lists.php
+++ b/includes/functions/functions_print_lists.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy
@@ -1738,14 +1738,14 @@ function print_changes_list($change_ids, $sort) {
switch ($sort) {
case 'name':
- uasort($arr, 'Webtrees\event_sort_name');
+ uasort($arr, __NAMESPACE__ . '\event_sort_name');
break;
case 'date_asc':
- uasort($arr, 'Webtrees\event_sort');
+ uasort($arr, __NAMESPACE__ . '\event_sort');
$arr = array_reverse($arr);
break;
case 'date_desc':
- uasort($arr, 'Webtrees\event_sort');
+ uasort($arr, __NAMESPACE__ . '\event_sort');
}
$html = '';
foreach ($arr as $value) {
diff --git a/includes/functions/functions_rtl.php b/includes/functions/functions_rtl.php
index e72b2f3eea..9e3cbd51d0 100644
--- a/includes/functions/functions_rtl.php
+++ b/includes/functions/functions_rtl.php
@@ -1,5 +1,5 @@
<?php
-namespace Webtrees;
+namespace Fisharebest\Webtrees;
/**
* webtrees: online genealogy