srchub Commit Details

Date:

2015-01-18 22:06:57 (10 years 1 month ago)

Author:

Natalie Adams

Branch:

master

Commit:

ce09cf446e1cefae8d604dd3af221d44de05ec8f

Parents:

8555a1b7f7fee2f077e8608220a1269f40d439f2

Message:

Issue 99: Middleware needs to replace certain occurrences

Changes:

File differences

-60
61 61
62 62
63 
64 
63
64
65 65
66 66
67 67
+        }␍␊
        $replacead1 = $this->makead(Pluf::f("google_ads")["AD1"]);␍␊
        $replacead2 = $this->makead(Pluf::f("google_ads")["AD2"]);␍␊
        $response->content = str_replace('<!--AD1-->', $replacead1, $response->content);␍␊
        $response->content = str_replace('<!--AD2-->', $replacead2, $response->content);␍␊
        $response->content = substr_replace($response->content, $replacead1, strrpos($response->content,'<!--AD1-->'), strlen('<!--AD1-->'));␍␊
        $response->content = substr_replace($response->content, $replacead2, strrpos($response->content,'<!--AD2-->'), strlen('<!--AD2-->'));␍␊
        return $response;␍␊
    }␍␊
␍␊
         }␍␊
         $replacead1 = $this->makead(Pluf::f("google_ads")["AD1"]);␍␊
         $replacead2 = $this->makead(Pluf::f("google_ads")["AD2"]);␍␊
-        $response->content = str_replace('<!--AD1-->', $replacead1, $response->content);␍␊
-        $response->content = str_replace('<!--AD2-->', $replacead2, $response->content);␍␊
+        $response->content = substr_replace($response->content, $replacead1, strrpos($response->content,'<!--AD1-->'), strlen('<!--AD1-->'));␍␊
+        $response->content = substr_replace($response->content, $replacead2, strrpos($response->content,'<!--AD2-->'), strlen('<!--AD2-->'));␍␊
         return $response;␍␊
     }␍␊
 ␍␊

-61
62 62
63 63
64 
64
65 65
66 66
67 67
+␉␉$text = "Page rendered in " . sprintf('%.5f', (microtime(true) - $GLOBALS['_PX_starttime'])) . "s using " . count($GLOBALS['_PX_debug_data']['sql_queries']) . " queries.";␊
␉else␊
␉␉$text = "Page rendered in " . sprintf('%.5f', (microtime(true) - $GLOBALS['_PX_starttime'])) . "s.";␊
        $response->content = str_replace('</body>', $text.'</body>', $response->content);␊
        $response->content = substr_replace($response->content, $text.'</body>', strrpos($response->content,'</body>'), strlen('</body>'));␊
        return $response;␊
    }␊
}␊
 ␉␉$text = "Page rendered in " . sprintf('%.5f', (microtime(true) - $GLOBALS['_PX_starttime'])) . "s using " . count($GLOBALS['_PX_debug_data']['sql_queries']) . " queries.";␊
 ␉else␊
 ␉␉$text = "Page rendered in " . sprintf('%.5f', (microtime(true) - $GLOBALS['_PX_starttime'])) . "s.";␊
-        $response->content = str_replace('</body>', $text.'</body>', $response->content);␊
+        $response->content = substr_replace($response->content, $text.'</body>', strrpos($response->content,'</body>'), strlen('</body>'));␊
         return $response;␊
     }␊
 }␊

Download the corresponding diff file

srchub

File differences

Branches