Merge remote-tracking branch 'upstream/dev' into website-export. Added attach_move() to include/attach.php.

This commit is contained in:
Andrew Manning
2016-08-27 06:52:01 -04:00
26 changed files with 7117 additions and 6819 deletions

View File

@@ -1286,8 +1286,8 @@ function widget_random_block($arr) {
function widget_rating($arr) {
$poco_rating = get_config('system','poco_rating_enable');
if((! $poco_rating) && ($poco_rating !== false)) {
$rating_enabled = get_config('system','rating_enabled');
if(! $rating_enabled) {
return;
}