Rows and columns swapped on photos page

Fixes issue#34
jeroenrnl · Jan 19, 2013 · 6c3005b · 6c3005b · jeroenrnl · Jan 19, 2013
1 parent 0796029
commit 6c3005b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/php/edit_photos.php b/php/edit_photos.php
@@ -26,8 +26,8 @@
         die("Illegal characters in _order");
     }
 
-    if (!$_cols) { $_cols = $user->prefs->get("num_rows"); }
-    if (!$_rows) { $_rows = $user->prefs->get("num_cols"); }
+    if (!$_cols) { $_cols = $user->prefs->get("num_cols"); }
+    if (!$_rows) { $_rows = $user->prefs->get("num_rows"); }
     if (!$_off)  { $_off = 0; }
 
     if (!$_order) { $_order = conf::get("interface.sort.order"); }

diff --git a/php/photo.php b/php/photo.php
@@ -16,7 +16,6 @@
  * along with Zoph; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-
     require_once("include.inc.php");
     $photo_id = getvar("photo_id");
     $_off = getvar("_off");
@@ -91,8 +90,8 @@
         $_rows = (int) getvar("_rows");
         $_off = (int) getvar("_off");
 
-        if (!$_cols) { $_cols = $user->prefs->get("num_rows"); }
-        if (!$_rows) { $_rows = $user->prefs->get("num_cols"); }
+        if (!$_cols) { $_cols = $user->prefs->get("num_cols"); }
+        if (!$_rows) { $_rows = $user->prefs->get("num_rows"); }
         if (!$_off)  { $_off = 0; }
 
         $cells = $_cols * $_rows;

diff --git a/php/photos.php b/php/photos.php
@@ -30,8 +30,8 @@
         die("Illegal characters in _order");
     }
 
-    if (!$_cols) { $_cols = $user->prefs->get("num_rows"); }
-    if (!$_rows) { $_rows = $user->prefs->get("num_cols"); }
+    if (!$_cols) { $_cols = $user->prefs->get("num_cols"); }
+    if (!$_rows) { $_rows = $user->prefs->get("num_rows"); }
     if (!$_off)  { $_off = 0; }
 
     if (!$_order) { $_order = conf::get("interface.sort.order"); }