Skip to content
Browse files

Merge branch 'master' into develop

  • Loading branch information...
2 parents 1b4684f + c88db6c commit e18ab8d4014033ecda691eb8f5766a4e4a6f836c @alanhogan committed Apr 8, 2012
Showing with 2 additions and 1 deletion.
  1. +1 −1 -/pages/done.php
  2. +1 −0 .htaccess
View
2 -/pages/done.php
@@ -6,7 +6,7 @@
<p>
<!-- Using shortlink class. See http://ajh.us/k -->
- <input type="text" id="url" class="shortlink" value="<?php echo htmlspecialchars($new_url); ?>" onclick="this.focus();this.select();" readonly="readonly" />
+ <input type="text" id="url" class="shortlink" value="<?php echo htmlspecialchars($new_url); ?>" onclick="this.focus();this.select();" />
→ <strong><?php echo htmlspecialchars($url, ENT_QUOTES, 'UTF-8'); ?></strong>
</p>
<p>
View
1 .htaccess
@@ -1,5 +1,6 @@
<IfModule mod_rewrite.c>
RewriteEngine on
+ RewriteBase /
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME} !-f
RewriteRule (.*) index.php?token=$1 [QSA,L]

0 comments on commit e18ab8d

Please sign in to comment.
Something went wrong with that request. Please try again.