diff options
| -rw-r--r-- | Zotlabs/Daemon/Cron.php | 3 | ||||
| -rw-r--r-- | boot.php | 7 | ||||
| -rw-r--r-- | include/attach.php | 35 | ||||
| -rw-r--r-- | view/tpl/page_display.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/page_display_empty.tpl | 2 |
5 files changed, 2 insertions, 47 deletions
diff --git a/Zotlabs/Daemon/Cron.php b/Zotlabs/Daemon/Cron.php index d2c863572..3f5ce28eb 100644 --- a/Zotlabs/Daemon/Cron.php +++ b/Zotlabs/Daemon/Cron.php @@ -178,9 +178,6 @@ class Cron { } } - require_once('include/attach.php'); - attach_upgrade(); - // once daily run birthday_updates and then expire in background // FIXME: add birthday updates, both locally and for xprof for use @@ -1538,13 +1538,6 @@ function check_config() { App::set_baseurl(z_root()); - // Make sure each site has a system channel. This is now created on install - // so we just need to keep this around a couple of weeks until the hubs that - // already exist have one - $syschan_exists = get_sys_channel(); - if (!$syschan_exists) - create_sys_channel(); - new DB_Upgrade(DB_UPDATE_VERSION); plugins_sync(); diff --git a/include/attach.php b/include/attach.php index 768f5dd50..4abcb3787 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2933,41 +2933,6 @@ function attach_syspaths($channel_id,$attach_hash) { return [ 'os_path' => $os_path, 'path' => $path ]; } -/** - * in earlier releases we did not fill in os_path and display_path in the attach DB structure. - * (It was not needed or used). Going forward we intend to make use of these fields. - * A cron task checks for empty values (as older attachments may have arrived at our site - * in a clone operation) and executes attach_syspaths() to generate these field values and correct - * the attach table entry. The operation is limited to 100 DB entries at a time so as not to - * overload the system in any cron run. Eventually it will catch up with old attach structures - * and switch into maintenance mode to correct any that might arrive in clone packets from older - * sites. - */ - - - -function attach_upgrade() { - $r = q("SELECT id, uid, hash FROM attach WHERE os_path = '' OR display_path = '' LIMIT 100"); - if($r) { - foreach($r as $rv) { - $x = attach_syspaths($rv['uid'],$rv['hash']); - if($x) { - q("update attach set os_path = '%s', display_path = '%s' where id = %d", - dbesc($x['os_path']), - dbesc($x['path']), - intval($rv['id']) - ); - q("update photo set os_path = '%s', display_path = '%s' where uid = %d and resource_id = '%s'", - dbesc($x['os_path']), - dbesc($x['path']), - intval($rv['uid']), - dbesc($rv['hash']) - ); - } - } - } -} - /** * Chunked uploader for integration with the blueimp jquery-uploader diff --git a/view/tpl/page_display.tpl b/view/tpl/page_display.tpl index e8c9c0e27..2e87c68e3 100644 --- a/view/tpl/page_display.tpl +++ b/view/tpl/page_display.tpl @@ -10,7 +10,7 @@ <div class="page-date">{{$date}}</div> <div class="page-body">{{$body}}</div> {{if $edit_link}} - <div class="position-fixed bottom-0 end-0 m-3"> + <div class="position-fixed bottom-0 end-0 m-3 z-1"> <a href="{{$edit_link}}" class="btn btn-lg btn-primary rounded-circle"><i class="bi bi-pencil"></i></a> </div> {{/if}} diff --git a/view/tpl/page_display_empty.tpl b/view/tpl/page_display_empty.tpl index 44baec361..c24fe08e5 100644 --- a/view/tpl/page_display_empty.tpl +++ b/view/tpl/page_display_empty.tpl @@ -1,6 +1,6 @@ {{$body}} {{if $edit_link}} <div class="position-fixed bottom-0 end-0 m-3"> - <a href="{{$edit_link}}" class="btn btn-lg btn-primary rounded-circle"><i class="bi bi-pencil"></i></a> + <a href="{{$edit_link}}" class="btn btn-lg btn-primary rounded-circle z-1"><i class="bi bi-pencil"></i></a> </div> {{/if}} |