aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-05-12 18:56:34 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2013-05-12 18:56:34 -0500
commitbcf7ea33106ba99aee20d672eda3d58c95251f11 (patch)
tree3a6f4b7fba8c07f91ad8b17bf1de2f30e13522e6 /phpBB/includes
parentf93a750f28ca4ca502a880d44a45a72c340b6e38 (diff)
parentf17e67364dca55c9ccd8416f41547fa4097cdcd4 (diff)
downloadforums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar
forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar.gz
forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar.bz2
forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.tar.xz
forums-bcf7ea33106ba99aee20d672eda3d58c95251f11.zip
Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop
# By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11533: [ticket/11533] Update unit tests [ticket/11533] Fix colspan and unnecessary tables [ticket/11533] Change list to table for notification settings [ticket/11533] Columns counter for notification settings
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/ucp/ucp_notifications.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php
index 338c921e94..72c41776b3 100644
--- a/phpBB/includes/ucp/ucp_notifications.php
+++ b/phpBB/includes/ucp/ucp_notifications.php
@@ -200,6 +200,10 @@ class ucp_notifications
}
}
}
+
+ $template->assign_vars(array(
+ strtoupper($block) . '_COLS' => sizeof($notification_methods) + 2,
+ ));
}
/**