diff --git a/include/class.attachment.php b/include/class.attachment.php index c4fc059c453f8e6da6541b7ff28548d104387393..3b25f87a019cd7e5868be68fc67266e1e51740fa 100644 --- a/include/class.attachment.php +++ b/include/class.attachment.php @@ -176,11 +176,10 @@ extends InstrumentedList { } function deleteAll($inline_only=false){ - $objects = $this; if ($inline_only) - $objects = $objects->filter(array('inline' => 1)); + return $this->objects()->filter(array('inline' => 1))->delete(); - return $objects->delete(); + return parent::expunge(); } function deleteInlines() { diff --git a/include/class.dept.php b/include/class.dept.php index 4e42d9335fca4fe40f339266012c8f400868100e..a66198500450581ae25e8e6a561de4f4677cc431 100644 --- a/include/class.dept.php +++ b/include/class.dept.php @@ -408,7 +408,7 @@ implements TemplateVariable { $this->getConfig()->destroy(); } - return $num; + return true; } function __toString() { diff --git a/include/class.page.php b/include/class.page.php index 69596e88257fb00a167af3f7b99897ced071b10c..6625c3f5c38bb7f5325be89997b991bd39a479a4 100644 --- a/include/class.page.php +++ b/include/class.page.php @@ -45,6 +45,7 @@ class Page extends VerySimpleModel { function getHashtable() { $base = $this->ht; unset($base['topics']); + unset($base['attachments']); return $base; } diff --git a/scp/js/jquery.dropdown.js b/scp/js/jquery.dropdown.js index 84a843dfd0e120660bfa1a3376a94d1c5ebb46f0..b516ea9d97d1f610a0acc7bdbda2c90a47c87660 100644 --- a/scp/js/jquery.dropdown.js +++ b/scp/js/jquery.dropdown.js @@ -55,7 +55,7 @@ if(jQuery) (function($) { dropdown.css({ left: -offset.left + (dropdown.hasClass('anchor-right') ? - trigger.offset().left - (dropdown.outerWidth() - trigger.outerWidth() - 4) : trigger.offset().left), + trigger.offset().left - (dropdown.outerWidth() - trigger.outerWidth() - 7) : trigger.offset().left), top: -offset.top + trigger.offset().top + trigger.outerHeight() }).show(); trigger.addClass('dropdown-open');