--- system/application/errors/error_404.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/errors/error_404.php	2010-11-28 15:14:44.000000000 +0100
@@ -19,12 +19,12 @@
 		<div id="container">
 			<div class="container">
 				<div class="header">
-					<h1><a href="<?=$config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
+					<h1><a href="<?php echo $config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
 					<div class="tabs">
 						<ul>
-							<li><a href="<?=$config['base_url']?>index.php">Paste</a></li>
-							<li><a href="<?=$config['base_url']?>index.php/lists">Recent</a></li>
-							<li><a href="<?=$config['base_url']?>index.php/about">About</a></li>
+							<li><a href="<?php echo $config['base_url']?>index.php">Paste</a></li>
+							<li><a href="<?php echo $config['base_url']?>index.php/lists">Recent</a></li>
+							<li><a href="<?php echo $config['base_url']?>index.php/about">About</a></li>
 						</ul>
 					</div>
 				</div>
@@ -32,10 +32,10 @@
 				<div class="page">
 					<div class="content">
 						<div class="container">
-							<h1><?=$heading?></h1>
+							<h1><?php echo $heading?></h1>
 							<div class="about">
-								<?=$message?>
-								<p>Woops! We can't find that page, <a href="<?=$config['base_url']?>">Go Home</a></p>
+								<?php echo $message?>
+								<p>Woops! We can't find that page, <a href="<?php echo $config['base_url']?>">Go Home</a></p>
 							</div>
 						</div>
 					</div>
--- system/application/errors/error_db.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/errors/error_db.php	2010-11-28 15:14:44.000000000 +0100
@@ -19,12 +19,12 @@
 		<div id="container">
 			<div class="container">
 				<div class="header">
-					<h1><a href="<?=$config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
+					<h1><a href="<?php echo $config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
 					<div class="tabs">
 						<ul>
-							<li><a href="<?=$config['base_url']?>index.php">Paste</a></li>
-							<li><a href="<?=$config['base_url']?>index.php/lists">Recent</a></li>
-							<li><a href="<?=$config['base_url']?>index.php/about">About</a></li>
+							<li><a href="<?php echo $config['base_url']?>index.php">Paste</a></li>
+							<li><a href="<?php echo $config['base_url']?>index.php/lists">Recent</a></li>
+							<li><a href="<?php echo $config['base_url']?>index.php/about">About</a></li>
 						</ul>
 					</div>
 				</div>
@@ -32,10 +32,10 @@
 				<div class="page">
 					<div class="content">
 						<div class="container">
-							<h1><?=$heading?></h1>
+							<h1><?php echo $heading?></h1>
 							<div class="about">
-								<?=$message?>
-								<p><a href="<?=$config['base_url']?>">Go Home</a></p>
+								<?php echo $message?>
+								<p><a href="<?php echo $config['base_url']?>">Go Home</a></p>
 							</div>
 						</div>
 					</div>
--- system/application/errors/error_general.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/errors/error_general.php	2010-11-28 15:14:44.000000000 +0100
@@ -19,11 +19,11 @@
 		<div id="container">
 			<div class="container">
 				<div class="header">
-					<h1><a href="<?=$config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
+					<h1><a href="<?php echo $config['base_url']?>" class="title"><?php echo $config['site_name']?></a></h1>
 					<div class="tabs">
-						<li><a href="<?=$config['base_url']?>index.php">Paste</a></li>
-						<li><a href="<?=$config['base_url']?>index.php/lists">Recent</a></li>
-						<li><a href="<?=$config['base_url']?>index.php/about">About</a></li>
+						<li><a href="<?php echo $config['base_url']?>index.php">Paste</a></li>
+						<li><a href="<?php echo $config['base_url']?>index.php/lists">Recent</a></li>
+						<li><a href="<?php echo $config['base_url']?>index.php/about">About</a></li>
 						</ul>
 					</div>
 				</div>
@@ -31,10 +31,10 @@
 				<div class="page">
 					<div class="content">
 						<div class="container">
-							<h1><?=$heading?></h1>
+							<h1><?php echo $heading?></h1>
 							<div class="about">
-								<?=$message?>
-								<p><a href="<?=$config['base_url']?>">Go Home</a></p>
+								<?php echo $message?>
+								<p><a href="<?php echo $config['base_url']?>">Go Home</a></p>
 							</div>
 						</div>
 					</div>
--- system/application/views/defaults/header.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/defaults/header.php	2010-11-28 15:14:44.000000000 +0100
@@ -5,25 +5,25 @@
 	<head>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 		<title><?php echo $this->config->item('site_name');?></title>
-		<link rel="stylesheet" href="<?=base_url()?>static/styles/reset.css" type="text/css" />
-		<link rel="stylesheet" href="<?=base_url()?>static/styles/fonts.css" type="text/css" />
-		<link rel="stylesheet" href="<?=base_url()?>static/styles/main.css" type="text/css" media="screen" title="main" charset="utf-8" />
+		<link rel="stylesheet" href="<?php echo base_url()?>static/styles/reset.css" type="text/css" />
+		<link rel="stylesheet" href="<?php echo base_url()?>static/styles/fonts.css" type="text/css" />
+		<link rel="stylesheet" href="<?php echo base_url()?>static/styles/main.css" type="text/css" media="screen" title="main" charset="utf-8" />
 	
 		<?php if(!empty($scripts)){?>
 		<?php foreach($scripts as $script){?>
-		<script src="<?=base_url()?>static/js/<?=$script?>" type="text/javascript"></script>
+		<script src="<?php echo base_url()?>static/js/<?php echo $script?>" type="text/javascript"></script>
 		<?}}?>		
 	</head>
 	<body>
 		<div id="container">
 			<div class="container">			
 				<div class="header">
-					<h1><a href="<?=base_url()?>" class="title"><?php echo $this->config->item('site_name');?></a></h1>
+					<h1><a href="<?php echo base_url()?>" class="title"><?php echo $this->config->item('site_name');?></a></h1>
 					<ul class="tabs">
 						<?php $l = $this->uri->segment(1)?>
-						<li><a <?php if($l == ""){ echo 'class="active"'; }?> href="<?=base_url()?>" title="Create A New Paste">Create</a></li>
-						<li><a <?php if($l == "lists" || $l == "view" and $this->uri->segment(2) != "options"){ echo 'class="active"'; }?> href="<?=site_url("lists")?>" title="Recent Pastes">Recent</a></li>
-						<li><a  <?php if($l == "about"){ echo 'class="active"'; }?> href="<?=site_url("about/")?>" title="About Paste.mycodenow.com">About</a></li>
+						<li><a <?php if($l == ""){ echo 'class="active"'; }?> href="<?php echo base_url()?>" title="Create A New Paste">Create</a></li>
+						<li><a <?php if($l == "lists" || $l == "view" and $this->uri->segment(2) != "options"){ echo 'class="active"'; }?> href="<?php echo site_url("lists")?>" title="Recent Pastes">Recent</a></li>
+						<li><a  <?php if($l == "about"){ echo 'class="active"'; }?> href="<?php echo site_url("about/")?>" title="About Paste.mycodenow.com">About</a></li>
 					</ul>
 				</div>
 
--- system/application/views/defaults/paste_form.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/defaults/paste_form.php	2010-11-28 15:14:44.000000000 +0100
@@ -10,7 +10,7 @@
 
 <?php if(isset($this->validation->error_string)){ echo $this->validation->error_string; }?>
 <div class="form_wrapper margin">
-	<form action="<?=base_url()?>" method="post">
+	<form action="<?php echo base_url()?>" method="post">
 
 		<h1><?php if(!isset($page['title'])){ ?>
 			Create a new paste
--- system/application/views/iphone/header.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/iphone/header.php	2010-11-28 15:14:44.000000000 +0100
@@ -5,7 +5,7 @@
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 		<meta name="viewport" content="width=320; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
 		<title>Stikked - iPhone</title>
-		<link rel="stylesheet" href="<?=base_url()?>static/styles/iphone.css" type="text/css" media="screen" title="iphone stylesheet" charset="utf-8" />
+		<link rel="stylesheet" href="<?php echo base_url()?>static/styles/iphone.css" type="text/css" media="screen" title="iphone stylesheet" charset="utf-8" />
 	</head>
 	<body>
 		<div id="container">
@@ -15,7 +15,7 @@
 					<div class="toolbar">	
 						<ul>
 							<?php $page = $this->uri->segment(2); // There is currently only one link so the active link may seem pointless but this future proofs it. ?>
-							<li class="<?if($page =="" || $page == "view"){?>active<?}?>"><a href="<?=base_url()?>iphone">View</a></li>
+							<li class="<?if($page =="" || $page == "view"){?>active<?}?>"><a href="<?php echo base_url()?>iphone">View</a></li>
 						</ul>
 					</div>
 				</div>
--- system/application/views/iphone/recent.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/iphone/recent.php	2010-11-28 15:14:44.000000000 +0100
@@ -11,14 +11,14 @@
 								$eo = "odd";
 							}
 					?>
-						<li class="<?=$eo?>">
-							<span class="title"><a href="<?=base_url()?>iphone/view/<?=$paste['pid']?>"><?=$paste['title']?></a></span>
-							<span class="author"><?=$paste['name']?></span>
+						<li class="<?php echo $eo?>">
+							<span class="title"><a href="<?php echo base_url()?>iphone/view/<?php echo $paste['pid']?>"><?php echo $paste['title']?></a></span>
+							<span class="author"><?php echo $paste['name']?></span>
 						</li>
 						<? }?>
 				
 					
-						<?=$pages?>
+						<?php echo $pages?>
 					</ul>
 				<? } else { ?>
 					<p>Sorry no pastes to show :)</p>
--- system/application/views/iphone/view.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/iphone/view.php	2010-11-28 15:14:44.000000000 +0100
@@ -1,11 +1,11 @@
 <?php $this->load->view('iphone/header'); ?>
 <div class="info">
-	<h1 class="pagetitle"><?=$title?></h1>
+	<h1 class="pagetitle"><?php echo $title?></h1>
 	<div class="meta">
-		<p><strong>By</strong> <?=$name?>, <? $p = explode(',', timespan($created, time())); echo $p[0]?> ago, written in <?=$lang?>.</p>
+		<p><strong>By</strong> <?php echo $name?>, <? $p = explode(',', timespan($created, time())); echo $p[0]?> ago, written in <?php echo $lang?>.</p>
 	</div>
 </div>
 <div class="text_formatted">
-	<?=$paste?>
+	<?php echo $paste?>
 </div>
 <?php $this->load->view('iphone/footer'); ?>
\ Kein Zeilenumbruch am Dateiende.
--- system/application/views/list.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/list.php	2010-11-28 15:14:44.000000000 +0100
@@ -25,10 +25,10 @@
 				$n++;
 		?>	
 
-		<tr class="<?=$eo?>">
-			<td class="first"><a href="<?=site_url("view/".$paste['pid'])?>"><?=$paste['title']?></a></td>
-			<td><?=$paste['name']?></td>
-			<td><?=$paste['lang']?></td>
+		<tr class="<?php echo $eo?>">
+			<td class="first"><a href="<?php echo site_url("view/".$paste['pid'])?>"><?php echo $paste['title']?></a></td>
+			<td><?php echo $paste['name']?></td>
+			<td><?php echo $paste['lang']?></td>
 			<td><? $p = explode(",", timespan($paste['created'], time())); echo $p[0];?> ago.</td>
 		</tr>
 
@@ -38,6 +38,6 @@
 		<?} else { ?>
 			<p>There have been no pastes :(</p>
 		<? }?>
-<?=$pages?>
+<?php echo $pages?>
 <div class="spacer"></div>
 <?php $this->load->view('defaults/footer');?>
--- system/application/views/view/raw.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/view/raw.php	2010-11-28 15:14:44.000000000 +0100
@@ -5,10 +5,10 @@
 	<head>
 		<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
 		<title><?php echo $this->config->item('site_name');?></title>
-		<link rel="stylesheet" href="<?=base_url()?>static/styles/raw.css" type="text/css" media="screen" title="raw stylesheet" charset="utf-8" />
+		<link rel="stylesheet" href="<?php echo base_url()?>static/styles/raw.css" type="text/css" media="screen" title="raw stylesheet" charset="utf-8" />
 		<?php if(!empty($scripts)){?>
 		<?php foreach($scripts as $script){?>
-		<script src="<?=base_url()?>static/js/<?=$script?>" type="text/javascript"></script>
+		<script src="<?php echo base_url()?>static/js/<?php echo $script?>" type="text/javascript"></script>
 		<?}}?>
 	</head>
 	<body>
@@ -17,17 +17,17 @@
 				echo $insert;
 			}?>
 			
-			<h1><?=$title?></h1>
+			<h1><?php echo $title?></h1>
 			<?php if(!$this->db_session->userdata("view_raw")){?>
-				<a href="<?=site_url("view/".$pid)?>">Go Back</a>
+				<a href="<?php echo site_url("view/".$pid)?>">Go Back</a>
 			<?php } else { ?>
-				<a href="<?=base_url()?>">Go Home</a>
+				<a href="<?php echo base_url()?>">Go Home</a>
 			<?php }?> 
-			&mdash; <a href="<?=site_url("view/options")?>">Change Paste Viewing Options</a>
+			&mdash; <a href="<?php echo site_url("view/options")?>">Change Paste Viewing Options</a>
 			<pre>
-<?=$raw?>
+<?php echo $raw?>
 			</pre>
-			<?php if(!$this->db_session->userdata("view_raw")){?><a href="<?=site_url("view/".$pid)?>">Go Back</a><?php } else { ?><a href="<?=base_url()?>">Go Home</a><?php }?>		
+			<?php if(!$this->db_session->userdata("view_raw")){?><a href="<?php echo site_url("view/".$pid)?>">Go Back</a><?php } else { ?><a href="<?php echo base_url()?>">Go Home</a><?php }?>		
 		</div>
 		<?php $this->load->view('defaults/stats'); ?>
 	</body>
--- system/application/views/view/view_options.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/view/view_options.php	2010-11-28 15:14:44.000000000 +0100
@@ -1,7 +1,7 @@
 <?php $this->load->view("defaults/header"); ?>
 
 <div class="form_wrapper margin full">
-	<form action="<?=site_url("view/options")?>" method="post">
+	<form action="<?php echo site_url("view/options")?>" method="post">
 
 		<h1>Change paste viewing options</h1>
 		<p class="explain border">Here you can change your preferences for viewing pastes. Requires cookies to be enabled.</p>								
--- system/application/views/view/view.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/application/views/view/view.php	2010-11-28 15:14:44.000000000 +0100
@@ -19,20 +19,20 @@
 
 <div class="paste_info">
 	<div class="info">
-		<h1 class="pagetitle right"><?=$title?></h1>
+		<h1 class="pagetitle right"><?php echo $title?></h1>
 		<div class="meta">
-			<span class="detail by">By <?=$name?>, <? $p = explode(',', timespan($created, time())); echo $p[0]?> ago, written in <?=$lang?>.</span>
+			<span class="detail by">By <?php echo $name?>, <? $p = explode(',', timespan($created, time())); echo $p[0]?> ago, written in <?php echo $lang?>.</span>
 			<?php if(isset($inreply)){?><span class="detail by">This paste is a reply to <a href="<?php echo $inreply['url']?>"><?php echo $inreply['title']; ?></a> by <?php echo $inreply['name']; ?></span><?php }?>
 			<div class="spacer"></div>
-			<span class="detail"><span class="item">URL </span><a href="<?=$url?>"><?=$url?></a></span>
+			<span class="detail"><span class="item">URL </span><a href="<?php echo $url?>"><?php echo $url?></a></span>
 			
 			<?php if(!empty($snipurl)){?>
-				<span class="detail"><span class="item">Snipurl </span><a href="<?=$snipurl?>"><?php echo htmlspecialchars($snipurl) ?></a></span>
+				<span class="detail"><span class="item">Snipurl </span><a href="<?php echo $snipurl?>"><?php echo htmlspecialchars($snipurl) ?></a></span>
 			<?php }?>
 			
 			<div class="spacer"></div>
 			
-			<span class="detail"><a class="control" href="<?=site_url("view/download/".$pid)?>">Download Paste</a> or <a class="control" href="<?=site_url("view/raw/".$pid)?>">View Raw</a> &mdash; <a href="#" class="expand control">Expand paste</a> to full width of browser | <a href="<?=site_url("view/options")?>">Change Viewing Options</a></span>
+			<span class="detail"><a class="control" href="<?php echo site_url("view/download/".$pid)?>">Download Paste</a> or <a class="control" href="<?php echo site_url("view/raw/".$pid)?>">View Raw</a> &mdash; <a href="#" class="expand control">Expand paste</a> to full width of browser | <a href="<?php echo site_url("view/options")?>">Change Viewing Options</a></span>
 		</div>
 	</div>
 </div>
@@ -44,7 +44,7 @@
 <div class="paste <?php if($full_width){ echo "full"; }?>">
 	<div class="text_formatted <?php if($full_width){ echo "full"; }?>">
 		<div class="container">
-			<?=$paste?>
+			<?php echo $paste?>
 		</div>
 	</div>
 </div>
@@ -82,9 +82,9 @@
 					$n++;
 			?>
 				
-				<tr class="<?=$eo?>">
-					<td class="first"><a href="<?=site_url("view/".$reply['pid'])?>"><?=$reply['title']?></a></td>
-					<td><?=$reply['name']?></td>
+				<tr class="<?php echo $eo?>">
+					<td class="first"><a href="<?php echo site_url("view/".$reply['pid'])?>"><?php echo $reply['title']?></a></td>
+					<td><?php echo $reply['name']?></td>
 					<td><? $p = explode(",", timespan($reply['created'], time())); echo $p[0];?> ago.</td>
 				</tr>
 		
--- system/libraries/Loader.php.bak	2010-11-28 15:14:44.000000000 +0100
+++ system/libraries/Loader.php	2010-11-28 15:14:44.000000000 +0100
@@ -703,7 +703,7 @@
 		
 		if ((bool) @ini_get('short_open_tag') === FALSE AND config_item('rewrite_short_tags') == TRUE)
 		{
-			echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?=', '<?php echo ', file_get_contents($_ci_path))));
+			echo eval('?>'.preg_replace("/;*\s*\?>/", "; ?>", str_replace('<?php echo ', '<?php echo ', file_get_contents($_ci_path))));
 		}
 		else
 		{