summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Boyer2008-08-19 14:57:58 (GMT)
committer Sam Boyer2008-08-19 14:57:58 (GMT)
commitbdf7595561f109e458f627d38a9457d7ba48fb33 (patch)
treecbe985054b6a43c2317c7a660cafa6908d0095dc
parentd9ddf0ea49ed691d1ce0fadc042ae460270221aa (diff)
Updated with renamed argument error codes.
-rw-r--r--arguments/nid.inc4
-rw-r--r--arguments/node_add.inc2
-rw-r--r--arguments/node_edit.inc6
-rw-r--r--arguments/term.inc4
-rw-r--r--arguments/uid.inc4
-rw-r--r--arguments/vid.inc4
6 files changed, 12 insertions, 12 deletions
diff --git a/arguments/nid.inc b/arguments/nid.inc
index 4930c05..f48ff03 100644
--- a/arguments/nid.inc
+++ b/arguments/nid.inc
@@ -32,11 +32,11 @@ function panels_nid_context($node = NULL, $conf = NULL, $empty = FALSE) {
}
if (!is_object($node)) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
if (array_filter($conf['types']) && empty($conf['types'][$node->type])) {
- return PANELS_USE_FALLBACK_ROUTER;
+ return PANELS_ARG_USE_FALLBACK;
}
return panels_context_create('node', $node);
diff --git a/arguments/node_add.inc b/arguments/node_add.inc
index 5be50a4..ea6535e 100644
--- a/arguments/node_add.inc
+++ b/arguments/node_add.inc
@@ -32,7 +32,7 @@ function panels_node_add_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
if (array_filter($conf['types']) && empty($conf['types'][$arg])) {
- return PANELS_USE_FALLBACK_ROUTER;
+ return PANELS_ARG_USE_FALLBACK;
}
return panels_context_create('node_add_form', $arg);
diff --git a/arguments/node_edit.inc b/arguments/node_edit.inc
index 77c8e3f..64040dc 100644
--- a/arguments/node_edit.inc
+++ b/arguments/node_edit.inc
@@ -32,16 +32,16 @@ function panels_node_edit_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
if (!is_numeric($arg)) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
$node = node_load($arg);
if (!$node) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
if (array_filter($conf['types']) && empty($conf['types'][$node->type])) {
- return PANELS_USE_FALLBACK_ROUTER;
+ return PANELS_ARG_USE_FALLBACK;
}
// This will perform a node_access check, so we don't have to.
diff --git a/arguments/term.inc b/arguments/term.inc
index 7e4bde5..2afc358 100644
--- a/arguments/term.inc
+++ b/arguments/term.inc
@@ -59,11 +59,11 @@ function panels_term_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
if (empty($term)) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
if (!empty($conf['vids']) && array_filter($conf['vids']) && empty($conf['vids'][$term->vid])) {
- return PANELS_USE_FALLBACK_ROUTER;
+ return PANELS_ARG_USE_FALLBACK;
}
return panels_context_create('term', $term);
diff --git a/arguments/uid.inc b/arguments/uid.inc
index 22de9ba..9e47a5e 100644
--- a/arguments/uid.inc
+++ b/arguments/uid.inc
@@ -32,12 +32,12 @@ function panels_uid_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
if (!is_numeric($arg)) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
$user = user_load(array('uid' => $arg));
if (!$user) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
return panels_context_create('user', $user);
diff --git a/arguments/vid.inc b/arguments/vid.inc
index f284a35..a227eff 100644
--- a/arguments/vid.inc
+++ b/arguments/vid.inc
@@ -32,12 +32,12 @@ function panels_vid_context($arg = NULL, $conf = NULL, $empty = FALSE) {
}
if (!is_numeric($arg)) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
$vocabulary = taxonomy_get_vocabulary($arg);
if (!$vocabulary) {
- return PANELS_BAD_ARG;
+ return PANELS_ARG_IS_BAD;
}
return panels_context_create('vocabulary', $vocabulary);