Forráskód Böngészése

Merge 4543f39e3e24d7ef67732e9c5eabc2efba0bf3c5 into 13d9a0514bf506b84ea5122f44ceefb0e5c6e3f8

Mathieu Rochette 12 éve
szülő
commit
5aef7ec016
3 módosított fájl, 2 hozzáadás és 96 törlés
  1. 1 0
      lib/cache/.gitignore
  2. 0 87
      lib/cache/b0/36/0ab98142b2e0bbb248aad053058f.php
  3. 1 9
      lib/pico.php

+ 1 - 0
lib/cache/.gitignore

@@ -0,0 +1 @@
+!.gitignore

+ 0 - 87
lib/cache/b0/36/0ab98142b2e0bbb248aad053058f.php

@@ -1,87 +0,0 @@
-<?php
-
-/* index.html */
-class __TwigTemplate_b0360ab98142b2e0bbb248aad053058f extends Twig_Template
-{
-    protected function doDisplay(array $context, array $blocks = array())
-    {
-        // line 1
-        echo "<!DOCTYPE html>
-<html lang=\"en\" class=\"no-js\">
-<head>
-    <meta charset=\"utf-8\" />
-    
-    <title>";
-        // line 6
-        if (isset($context["meta"])) { $_meta_ = $context["meta"]; } else { $_meta_ = null; }
-        if ($this->getAttribute($_meta_, "title")) {
-            if (isset($context["meta"])) { $_meta_ = $context["meta"]; } else { $_meta_ = null; }
-            echo $this->getAttribute($_meta_, "title");
-            echo " | ";
-        }
-        if (isset($context["site_title"])) { $_site_title_ = $context["site_title"]; } else { $_site_title_ = null; }
-        echo $_site_title_;
-        echo "</title>
-    ";
-        // line 7
-        if (isset($context["meta"])) { $_meta_ = $context["meta"]; } else { $_meta_ = null; }
-        if ($this->getAttribute($_meta_, "description")) {
-            echo "<meta name=\"description\" content=\"";
-            if (isset($context["meta"])) { $_meta_ = $context["meta"]; } else { $_meta_ = null; }
-            echo $this->getAttribute($_meta_, "description");
-            echo "\">";
-        }
-        // line 8
-        echo "    ";
-        if (isset($context["meta"])) { $_meta_ = $context["meta"]; } else { $_meta_ = null; }
-        if ($this->getAttribute($_meta_, "robots")) {
-            echo "<meta name=\"robots\" content=\"";
-            if (isset($context["meta"])) { $_meta_ = $context["meta"]; } else { $_meta_ = null; }
-            echo $this->getAttribute($_meta_, "robots");
-            echo "\">";
-        }
-        // line 9
-        echo "    
-    <link rel=\"stylesheet\" href=\"";
-        // line 10
-        if (isset($context["theme_url"])) { $_theme_url_ = $context["theme_url"]; } else { $_theme_url_ = null; }
-        echo $_theme_url_;
-        echo "/style.css\" type=\"text/css\" media=\"screen\" />
-
-    <!--[if IE]>
-\t<meta http-equiv=\"X-UA-Compatible\" content=\"IE=edge,chrome=1\">
-\t<script type=\"text/javascript\" src=\"https://html5shiv.googlecode.com/svn/trunk/html5.js\"></script>
-    <![endif]-->
-    <script src=\"";
-        // line 16
-        if (isset($context["theme_url"])) { $_theme_url_ = $context["theme_url"]; } else { $_theme_url_ = null; }
-        echo $_theme_url_;
-        echo "/scripts/modernizr-1.7.min.js\"></script>
-</head>
-<body>
-
-    ";
-        // line 20
-        if (isset($context["content"])) { $_content_ = $context["content"]; } else { $_content_ = null; }
-        echo $_content_;
-        echo "
-
-</body>
-</html>";
-    }
-
-    public function getTemplateName()
-    {
-        return "index.html";
-    }
-
-    public function isTraitable()
-    {
-        return false;
-    }
-
-    public function getDebugInfo()
-    {
-        return array (  63 => 20,  55 => 16,  45 => 10,  42 => 9,  33 => 8,  25 => 7,  14 => 6,  7 => 1,);
-    }
-}

+ 1 - 9
lib/pico.php

@@ -103,16 +103,8 @@ class Pico {
 		$script_url  = (isset($_SERVER['PHP_SELF'])) ? $_SERVER['PHP_SELF'] : '';
 		if($request_url != $script_url) $url = trim(preg_replace('/'. str_replace('/', '\/', str_replace('index.php', '', $script_url)) .'/', '', $request_url, 1), '/');
 
-		$protocol = $this->get_protocol();
-		return rtrim(str_replace($url, '', $protocol . "://" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']), '/');
+		return rtrim(str_replace($url, '', "//" . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']), '/');
 	}
-
-	function get_protocol()
-	{
-		preg_match("|^HTTP[S]?|is",$_SERVER['SERVER_PROTOCOL'],$m);
-		return strtolower($m[0]);
-	}
-
 }
 
 ?>