From 94b3b8e6ee638a9c766005b8ec095096304d1362 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jun 2015 18:12:24 +0200
Subject: [PATCH 1/2] remove print_r()

---
 op/op.EditDocument.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/op/op.EditDocument.php b/op/op.EditDocument.php
index 0b6e645a7..314066565 100644
--- a/op/op.EditDocument.php
+++ b/op/op.EditDocument.php
@@ -268,7 +268,6 @@ if($attributes) {
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_min_values", array("attrname"=>$attrdef->getName())));
 				}
 				if($attrdef->getMaxValues() && $attrdef->getMaxValues() < count($attribute)) {
-					print_r($attrdef);
 					UI::exitError(getMLText("document_title", array("documentname" => $document->getName())),getMLText("attr_max_values", array("attrname"=>$attrdef->getName())));
 				}
 			}

From 77a5512f0b5d0640f6f163acd27598b4c944ba77 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Tue, 30 Jun 2015 18:53:40 +0200
Subject: [PATCH 2/2] move code for easier merging

---
 views/bootstrap/class.Bootstrap.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f8980c008..8e62b28b8 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -346,8 +346,6 @@ $(document).ready(function () {
 	function pageNavigation($pageTitle, $pageType=null, $extra=null) { /* {{{ */
 
 		if ($pageType!=null && strcasecmp($pageType, "noNav")) {
-			if($pageType == "view_folder" || $pageType == "view_document")
-				echo $pageTitle."\n";
 			echo "<div class=\"navbar\">\n";
 			echo " <div class=\"navbar-inner\">\n";
 			echo "  <div class=\"container\">\n";
@@ -378,6 +376,8 @@ $(document).ready(function () {
 			echo " 	</div>\n";
 			echo " </div>\n";
 			echo "</div>\n";
+			if($pageType == "view_folder" || $pageType == "view_document")
+				echo $pageTitle."\n";
 		} else {
 			echo "<legend>".$pageTitle."</legend>\n";
 		}