Merge branch 'master' into 2.4

confirm · Oct 13, 2015 · 655504b · 655504b
2 parents c3a8e03 + 3899177
commit 655504b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/composer.json b/composer.json
@@ -17,8 +17,6 @@
         "php": ">=5.3.0"
     },
     "autoload": {
-        "psr-0": {
-            "ZabbixApi": "build"
-        }
+        "classmap": ["build/"]
     }
-}
+}
diff --git a/templates/abstract.tpl.php b/templates/abstract.tpl.php
@@ -153,12 +153,12 @@ public function __construct($apiUrl='', $user='', $password='', $httpUser='', $h
         if ($httpUser && $httpPassword)
             $this->setBasicAuthorization($httpUser, $httpPassword);
 
+        $this->setVerifyPeer($verifyPeer);
+
         if ($authId)
             $this->setAuthId($authId);
         elseif($user && $password)
             $this->userLogin(array('user' => $user, 'password' => $password));
-
-        $this->setVerifyPeer($verifyPeer);
     }
 
     /**