[debian-edu-commits] debian-edu/slbackup-php.git (#131) - master (branch) updated: debian/0.3-5-89-g3300037

[Mike Gabriel]

The branch, master has been updated
       via  3300037859bea57ae9938e0fcf4563a7c9b46025 (commit)
      from  d90ef6bbd3d13323b7b06c16f35ef9e6b34ea104 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3300037859bea57ae9938e0fcf4563a7c9b46025
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Jun 7 15:25:41 2013 +0200

    Revert "Add missing 'break' in handling of PHP argument nonhttps, causing login to fail (Closes: #700257).  Patch from Wolfgang Schweer."
    
    This reverts commit 679daadcd89f12fe659785654f1040ddfded57b1.
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    2 --
 src/index.php    |    1 -
 2 files changed, 0 insertions(+), 3 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 3d00d43..af97e7b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,8 +10,6 @@ slbackup-php (0.4.3-3) UNRELEASED; urgency=low
   * Install slbackup-php.desktop into bin:package.
 
   [ Petter Reinholdtsen ]
-  * Add missing 'break' in handling of PHP argument nonhttps, causing
-    login to fail (Closes: #700257).  Patch from Wolfgang Schweer.
   * Remove no longer active uploaders Patrick Winnertz, Morten Werner
     Olsen, Finn-Arne Johansen.  A huge thank you to all of them for
     past help and effort.
diff --git a/src/index.php b/src/index.php
index 5207305..af2fad9 100644
--- a/src/index.php
+++ b/src/index.php
@@ -620,7 +620,6 @@ foreach ($arguments as $key => $value) {
             break ;
         case "nonhttps":
             $nonhttps = $value ;
-            break ;
         case "Passwd": 
             $passwd = $value ; 
             $submit = "status" ; 


hooks/post-receive
-- 
slbackup-php.git (Debian package slbackup-php)

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "slbackup-php.git" (Debian package slbackup-php).