Minor fixes

4 files changed, 11 insertions, 11 deletions

diff --git a/apps/field.php b/apps/field.php
index f34bffa..563b2b0 100644
--- a/apps/field.php
+++ b/apps/field.php
@@ -22,8 +22,8 @@ $isis = new IsisFinder();
 // Setup database and entry number.
 if ($isis) {
   // Query database.
-  $field_name = $isis->getFieldName($field);
-  $result     = $isis->nextField($entry, $field_name);
+  $field_name           = $isis->getFieldName($field);
+  list($entry, $result) = $isis->nextField($entry, $field_name);
 
   // Navigation bar.
   $display->navbar($entry, $isis->entries, $repetition, '&field='. $field);
diff --git a/apps/repetition.php b/apps/repetition.php
index 6b7f9de..b2f25c9 100644
--- a/apps/repetition.php
+++ b/apps/repetition.php
@@ -22,8 +22,8 @@ $isis = new IsisFinder();
 // Setup database and entry number.
 if ($isis) {
   // Query database.
-  $field_name = $isis->getFieldName($field);
-  $result     = $isis->nextRepetition($entry, $field_name);
+  $field_name           = $isis->getFieldName($field);
+  list($entry, $result) = $isis->nextRepetition($entry, $field_name);
 
   // Navigation bar.
   $display->navbar($entry, $isis->entries, $repetition, '&field='. $field);
diff --git a/apps/subfield.php b/apps/subfield.php
index e3d5d75..a4c804a 100644
--- a/apps/subfield.php
+++ b/apps/subfield.php
@@ -24,9 +24,9 @@ $isis = new IsisFinder();
 // Setup database and entry number.
 if ($isis) {
   // Query database.
-  $field_name    = $isis->getFieldName($field);
-  $subfield_name = $isis->getSubfieldName($field, $subfield);
-  $result        = $isis->nextSubfield($entry, $field_name, $subfield_name);
+  $field_name           = $isis->getFieldName($field);
+  $subfield_name        = $isis->getSubfieldName($field, $subfield);
+  list($entry, $result) = $isis->nextSubfield($entry, $field_name, $subfield_name);
 
   // Navigation bar.
   $display->navbar($entry, $isis->entries, $repetition, '&field='. $field . '&subfield='. $subfield);
diff --git a/classes/IsisFinder.php b/classes/IsisFinder.php
index 36732b5..80057c1 100644
--- a/classes/IsisFinder.php
+++ b/classes/IsisFinder.php
@@ -14,7 +14,7 @@ class IsisFinder extends IsisConnector {
    *   Field name.
    *
    * @return
-   *   Next repetition.
+   *   Next repetition entry and result.
    */
   public function nextRepetition($entry = 1, $field) {
     $entry--;
@@ -31,7 +31,7 @@ class IsisFinder extends IsisConnector {
       return FALSE;
     }
 
-    return $result;
+    return array($entry, $result);
   }
 
   /**
@@ -61,7 +61,7 @@ class IsisFinder extends IsisConnector {
       return FALSE;
     }
 
-    return $result;
+    return array($entry, $result);
   }
 
   /**
@@ -98,6 +98,6 @@ class IsisFinder extends IsisConnector {
       return FALSE;
     }
 
-    return $result;
+    return array($entry, $result);
   }
 }