Merge branch 'pull-request/111'

salathe · salathe · commit 19fcd4001b1c · 2016-06-20T12:50:03.000+01:00
diff --git a/conferences/index.php b/conferences/index.php
@@ -26,7 +26,9 @@
         }
     }
 }
-$panels = "";
+$panels = '<p class="prepend"><a href="https://wiki.php.net/conferences">Want to see your conference appear here?</a></p>';
+
+
 foreach($frontpage as $entry) {
     $link = substr($entry["id"], 15); // Strip http://php.net/
     $id   = parse_url($entry["id"], PHP_URL_FRAGMENT);

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`-$panels = "";`
	`29`	`+$panels = '<p class="prepend"><a href="https://wiki.php.net/conferences">Want to see your conference appear here?</a></p>';`
	`30`	`+`
	`31`	`+`
`30`	`32`	`foreach($frontpage as $entry) {`
`31`	`33`	`$link = substr($entry["id"], 15); // Strip http://php.net/`
`32`	`34`	`$id = parse_url($entry["id"], PHP_URL_FRAGMENT);`