Allow writing widgets using return instead of echo in the run method to make it…

Allow writing widgets using return instead of echo in the run method to make it consistent with controller

Allow writing widgets using return instead of echo in the run method to make it…
4023f421 · Alexander Makarov · 698d66a2 · 4023f421
Commit 4023f421 authored Jan 26, 2014 by Alexander Makarov
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

Widget.php framework/base/Widget.php +7 -2

No files found.
--- a/framework/base/Widget.php
+++ b/framework/base/Widget.php
@@ -93,8 +93,13 @@ class Widget extends Component implements ViewContextInterface
 		/** @var Widget $widget */
 		$config['class'] = get_called_class();
 		$widget = Yii::createObject($config);
-		$widget->run();
-		return ob_get_clean();
+		$out = $widget->run();
+		if (empty($out)) {
+			return ob_get_clean();
+		} else {
+			ob_clean();
+			return $out;
+		}
 	}

 	private $_id;