Merge branch 'master' of https://git.myonline.hu/pty/smbind-ng

Péter Szládovics
2 parents e7f1fc1a 05fbc816
Showing 3 changed files with 3 additions and 2 deletions
lib/smbind.class.php
src/include.php
src/slave_zoneread.php
@@ -585,6 +585,7 @@
             }
             return $ret;
         }
+
         public function getDeletedZones($zonetype = NULL) {
             $ret = array();
             if (is_string($zonetype)) {
@@ -525,7 +525,7 @@ function menu_buttons() {
     $cmasters = $user->getCommitableZones('master');
     $cmc = (is_array($cmasters)) ? sizeof($cmasters) : 0;
-    $cslaves = intval($user->getCommitableZones('slave'));
+    $cslaves = $user->getCommitableZones('slave');
     $csc = (is_array($cslaves)) ? sizeof($cslaves) : 0;
     $commitables = $cmc + $csc;
     if($commitables == 0) {
@@ -43,7 +43,7 @@ $smarty-&gt;assign(&quot;pagetitle&quot;, &quot;Slave zones&quot;);
 $smarty->assign("template", "slave_zoneread.tpl");
 $smarty->assign("help", help("zoneread"));
 $smarty->assign("menu_button", menu_buttons());
-$smarty->assign("page_root", $src . "zonelist.php?");
+$smarty->assign("page_root", $src . "slave_zonelist.php?");
 $smarty->display("main.tpl");
 ?>