fixed last commit
authorpk910 <philipp@zoelle1.de>
Sun, 6 Oct 2013 01:36:14 +0000 (03:36 +0200)
committerpk910 <philipp@zoelle1.de>
Sun, 6 Oct 2013 01:36:14 +0000 (03:36 +0200)
GITManagedWebpage.class.php

index 5b15d8cbf32293e6209683935ce3756d0628e306..2c429f96ed1a047e76a7f5c0f42739f078984cd9 100644 (file)
@@ -291,9 +291,7 @@ class GITManagedWebpage {
             return;
         
         if(!$this->branchExists($branch)) {
             return;
         
         if(!$this->branchExists($branch)) {
-            if($this->branchExists('origin/'.$branch))
-                $branch = 'origin/'.$branch;
-            else
+            if(!$this->branchExists('origin/'.$branch))
                 return false;
         }
         $this->setActiveBranch($branch, $remember);
                 return false;
         }
         $this->setActiveBranch($branch, $remember);