fixing regressions from cherrypicking

elrido · Aug 15, 2015 · e646729 · e646729
1 parent 5f87ea6
commit e646729
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/cfg/conf.ini b/cfg/conf.ini
@@ -53,7 +53,6 @@ never = 0
 1year = "1 year"
 never = "Never"
 
-
 [traffic]
 ; time limit between calls from the same IP address in seconds
 ; Set this to 0 to disable rate limiting.

diff --git a/js/zerobin.js b/js/zerobin.js
@@ -335,7 +335,7 @@ function send_data() {
 
             $('div#pastelink').html('Your paste is <a id="pasteurl" href="' + url + '">' + url + '</a> <span id="copyhint">(Hit CTRL+C to copy)</span>');
             $('div#deletelink').html('<a href="' + deleteUrl + '">Delete link</a>');
-            $('div#pasteresult').show();
+            $('div#pasteresult').removeClass('hidden');
             selectText('pasteurl'); // We pre-select the link so that the user only has to CTRL+C the link.
 
             setElementText($('div#cleartext'), $('textarea#message').val());
@@ -409,7 +409,7 @@ function stateExistingPaste() {
     else {
         $('button#clonebutton').removeClass('hidden');
     }
-    $('button#rawtextbutton').show();
+    $('button#rawtextbutton').removeClass('hidden');
 
     $('div#expiration').addClass('hidden');
     $('div#burnafterreadingoption').addClass('hidden');

diff --git a/lib/zerobin.php b/lib/zerobin.php
@@ -372,7 +372,7 @@ private function _delete($dataid, $deletetoken)
     private function _read($dataid)
     {
         // Is this a valid paste identifier?
-        if (preg_match('\A[a-f\d]{16}\z', $dataid))
+        if (preg_match('#\A[a-f\d]{16}\z#', $dataid))
         {
             // Check that paste exists.
             if ($this->_model()->exists($dataid))
@@ -452,6 +452,7 @@ private function _view()
                 $key;
         }
 
+        RainTPL::$path_replace = false;
         $page = new RainTPL;
         // we escape it here because ENT_NOQUOTES can't be used in RainTPL templates
         $page->assign('CIPHERDATA', htmlspecialchars($this->_data, ENT_NOQUOTES));

diff --git a/tpl/page.html b/tpl/page.html
@@ -57,17 +57,16 @@ <h3>{$VERSION}</h3>
 						</select>
 					</div>
 					<div id="remainingtime" class="hidden"></div>
-					<div id="burnafterreadingoption" class="button" style="display:none;">
+					<div id="burnafterreadingoption" class="button hidden">
 						<input type="checkbox" id="burnafterreading" name="burnafterreading" {if="$BURNAFTERREADINGSELECTED"} checked="checked"{/if} />
 						<label for="burnafterreading">Burn after reading</label>
 					</div>
-					<input id="password" value="Optional password..." class="hidden" />
 					<div id="opendisc" class="button hidden">
 						<input type="checkbox" id="opendiscussion" name="opendiscussion" {if="!$OPENDISCUSSION"} disabled="disabled"{/if} />
 						<label for="opendiscussion">Open discussion</label>
 					</div>
 				</div>
-				<div id="pasteresult" style="display:none;">
+				<div id="pasteresult" class="hidden">
 					<div id="deletelink"></div>
 					<div id="pastelink"></div>
 				</div>