first stab at paypal_ipn framework

[wfpl-cms.git] / admin_pages.php

diff --git a/admin_pages.php b/admin_pages.php
index 382ff5c..584aaa0 100644 (file)
--- a/admin_pages.php
+++ b/admin_pages.php
@@ -75,7 +75,7 @@ function admin_pages_main_delete($id) {
 # get all images from admin_images (for cms)
 function admin_pages_get_images() {
        $out = [];
-       $rows = db_get_assocs('cms_images', 'image,name,caption', 'order by name, caption, image');
+       $rows = db_get_assocs('cms_images', 'image,name,caption', "order by coalesce(nullif(name, ''), caption), created_at");
        if ($rows) {
                $id = -1;
                foreach($rows as &$row) { $id += 1;
@@ -168,6 +168,7 @@ function admin_pages_main_form($id = false) {
        }
 
        tem_set('wfpl_images_json', json_encode(admin_pages_get_images()));
+       tem_set('wfpl_image_width_full', WFPL_IMAGE_WIDTH_FULL);
        tem_set('wfpl_image_width_small', WFPL_IMAGE_WIDTH_SMALL);
        tem_set('wfpl_image_width_thumb', WFPL_IMAGE_WIDTH_THUMB);
        tem_set('form', $data);