Move link helper functions to HTML templating include.

diff --git a/public_html/includes/html-templating.php b/public_html/includes/html-templating.php
index aac4210d587e9e703983897c86776e0dd2d85fbb..ac29f2effe7fb0da45de8bcbb2d160ed44a072f1 100644 (file)
--- a/public_html/includes/html-templating.php
+++ b/public_html/includes/html-templating.php
@@ -25,3 +25,15 @@ function javascript($name) {
   <script type="text/javascript" <?php
           src($rel_path . $suffix);?>"></script><?php
 }
+
+// Link output helper functions.
+function href($path) {
+  echo 'href="';
+  esc(rel_url($path));
+  echo '"';
+}
+function src($path) {
+  echo 'src="';
+  esc(rel_url($path));
+  echo '"';
+}

diff --git a/public_html/includes/utils.php b/public_html/includes/utils.php
index a9f096ff0bde8510056c3684a0989938f358c505..bb62dc0eceac44c70a48ed5e1058e01e33a6465a 100644 (file)
--- a/public_html/includes/utils.php
+++ b/public_html/includes/utils.php
@@ -21,16 +21,6 @@ function rel_url($path) {
 function abs_url($path) {
   return 'https://ycra.org.uk' . rel_url($path);
 }
-function href($path) {
-  echo 'href="';
-  esc(rel_url($path));
-  echo '"';
-}
-function src($path) {
-  echo 'src="';
-  esc(rel_url($path));
-  echo '"';
-}
 
 /** Return cache control file suffix for file at $path
  *

diff --git a/public_html/index.php b/public_html/index.php
index 20caeed0b794e156feec1943df7122a55ec9fd76..20aeabb06ee245ef117e5eedece65f80e6db7de2 100644 (file)
--- a/public_html/index.php
+++ b/public_html/index.php
@@ -1,5 +1,4 @@
 <?php
-require_once('includes/utils.php');
 require_once('includes/html-templating.php');