diff options
| -rw-r--r-- | image_order.php | 4 | ||||
| -rw-r--r-- | templates/image_order.tpl | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/image_order.php b/image_order.php index e2e9d8a..6f2f04c 100644 --- a/image_order.php +++ b/image_order.php @@ -28,7 +28,7 @@ $gContent->verifyUpdatePermission(); if (!empty($_REQUEST['cancel'])) { header( 'Location: '.$gContent->getDisplayUrl() ); die; -} elseif (!empty($_REQUEST['updateImageOrder'])) { +} elseif (!empty($_REQUEST['save_order'])) { if( !empty( $_REQUEST['batch'] ) ) { // flip so we can do instant hash lookup $batchCon = array_flip( $_REQUEST['batch'] ); @@ -76,6 +76,7 @@ if (!empty($_REQUEST['cancel'])) { } break; } + natcasesort( $reorder ); $sortPos = 10; foreach( $reorder as $conId => $sortVal ) { @@ -167,6 +168,7 @@ if (!empty($_REQUEST['cancel'])) { } // if we are reordered, that takes precident $newPos = preg_replace( '/[^\d\.]/', '', (!empty( $newOrder[$contentId] ) ? $newOrder[$contentId] : $newPos) ); + if ($galleryItem->mInfo['title'] != $_REQUEST['image_title'][$contentId]) { $storageHash = array('title' => $_REQUEST['image_title'][$contentId]); // make sure we don't delete the 'data' field on en masse title updating diff --git a/templates/image_order.tpl b/templates/image_order.tpl index 0843a0c..5125f59 100644 --- a/templates/image_order.tpl +++ b/templates/image_order.tpl @@ -145,7 +145,7 @@ </div> <div class="form-group submit"> - <input type="submit" class="btn btn-default" name="cancel" value="{tr}Back{/tr}"/> <input type="submit" name="updateImageOrder" value="{tr}Save Changes{/tr}"/> + <input type="submit" class="btn btn-default" name="cancel" value="{tr}Back{/tr}"/> <input type="submit" class="btn btn-primary" name="save_order" value="{tr}Save Changes{/tr}"/> </div> {/form} </div><!-- end .body --> |