fix merge conflict with stylesheet tags

author Richard Beales <rich@richbeales.net>

Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)

committer Richard Beales <rich@richbeales.net>

Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
author Richard Beales <rich@richbeales.net>
Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
committer Richard Beales <rich@richbeales.net>
Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
diff --cc config.php-dist
Simple merge
diff --cc index.php

index 840959a18638f281486d3c9c734569ef7fe874f6,6d9608a38439e95565bd1669542b5dbffafc7ff0..8cb73777c811a9b41dc3d249270fba67165270a7
--- 1/index.php
--- 2/index.php
+++ b/index.php
@@@ -55,10 -53,11 +53,11 @@@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html>
   <head>
- -      <title>Tiny Tiny RSS</title>
+ +    <title><?php echo PAGE_TITLE ?></title>
-       <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
-       <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
-       <link rel="stylesheet" type="text/css" href="cdm.css?<?php echo $dt_add ?>"/>
+ 
+       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+       <?php echo stylesheet_tag("tt-rss.css"); ?>
+       <?php echo stylesheet_tag("cdm.css"); ?>
   
         <?php print_user_stylesheet($link) ?>
   
diff --cc prefs.php

index 0b9cb3cf2fd57e07fd6f068d47438c3dc5f75c29,cda53751b891d6c93f391af93c7379b4fb7f17d0..55a8d3afd8ef8daf2301fd08168758e49dc13df1
--- 1/prefs.php
--- 2/prefs.php
+++ b/prefs.php
@@@ -25,9 -23,10 +23,10 @@@
         "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
   <html>
   <head>
- -      <title>Tiny Tiny RSS : <?php echo __("Preferences") ?></title>
+ +      <title><?php echo PAGE_TITLE ?> : <?php echo __("Preferences") ?></title>
-       <link rel="stylesheet" type="text/css" href="lib/dijit/themes/claro/claro.css"/>
-       <link rel="stylesheet" type="text/css" href="tt-rss.css?<?php echo $dt_add ?>"/>
+ 
+       <?php echo stylesheet_tag("lib/dijit/themes/claro/claro.css"); ?>
+       <?php echo stylesheet_tag("tt-rss.css"); ?>
   
         <?php print_user_stylesheet($link) ?>
   
diff --cc register.php
Simple merge
author	Richard Beales <rich@richbeales.net>
	Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
committer	Richard Beales <rich@richbeales.net>
	Wed, 20 Mar 2013 16:59:19 +0000 (16:59 +0000)
		1	2
config.php-dist	patch \|	diff1 \|	diff2 \|	blob \| history
index.php	patch \|	diff1 \|	diff2 \|	blob \| history
prefs.php	patch \|	diff1 \|	diff2 \|	blob \| history
register.php	patch \|	diff1 \|	diff2 \|	blob \| history