summaryrefslogtreecommitdiff
path: root/modules/filter/filter.pages.inc
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-10-12 15:23:37 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-10-12 15:23:37 -0400
commit00206a4d7f87981b3b1212942ce65f371c0cb3ae (patch)
tree5cbe78d538838718714e3ece07deecf21b49db68 /modules/filter/filter.pages.inc
parentd2900abc52256190275b1ed7c3d75e88d14c48c4 (diff)
downloadbrdo-00206a4d7f87981b3b1212942ce65f371c0cb3ae.tar.gz
brdo-00206a4d7f87981b3b1212942ce65f371c0cb3ae.tar.bz2
Issue #1647440 by chrisrockwell, Dave Reid, greggles: Fix PHP notice if invalid format ID requested at filter/tips/format-id
Diffstat (limited to 'modules/filter/filter.pages.inc')
-rw-r--r--modules/filter/filter.pages.inc7
1 files changed, 3 insertions, 4 deletions
diff --git a/modules/filter/filter.pages.inc b/modules/filter/filter.pages.inc
index e602bcef0..0f13da842 100644
--- a/modules/filter/filter.pages.inc
+++ b/modules/filter/filter.pages.inc
@@ -14,10 +14,9 @@
* @see filter_menu()
* @see theme_filter_tips()
*/
-function filter_tips_long() {
- $format_id = arg(2);
- if ($format_id) {
- $output = theme('filter_tips', array('tips' => _filter_tips($format_id, TRUE), 'long' => TRUE));
+function filter_tips_long($format = NULL) {
+ if (!empty($format)) {
+ $output = theme('filter_tips', array('tips' => _filter_tips($format->format, TRUE), 'long' => TRUE));
}
else {
$output = theme('filter_tips', array('tips' => _filter_tips(-1, TRUE), 'long' => TRUE));