srchub Commit Details

Date:

2015-01-18 22:14:51 (10 years 1 month ago)

Author:

Natalie Adams

Branch:

master

Commit:

e74022e1900b689aecbc2f4469d0cb6fbded9344

Parents:

ce09cf446e1cefae8d604dd3af221d44de05ec8f

Message:

Fixing issue with ad middleware

Changes:

File differences

-60
61 61
62 62
63 
64 
63
64
65
66
67
68
65 69
66 70
67 71
+        }␍␊
        $replacead1 = $this->makead(Pluf::f("google_ads")["AD1"]);␍␊
        $replacead2 = $this->makead(Pluf::f("google_ads")["AD2"]);␍␊
        $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-->'));␍␊
        $pos1 = strpos($response->content,'<!--AD1-->');␍␊
        if ($pos1 !== false)␍␊
            $response->content = substr_replace($response->content, $replacead1, $pos1, strlen('<!--AD1-->'));␍␊
        $pos2 = strpos($response->content,'<!--AD2-->');␍␊
        if ($pos2 !== false)␍␊
            $response->content = substr_replace($response->content, $replacead2, $pos2, strlen('<!--AD2-->'));␍␊
        return $response;␍␊
    }␍␊
␍␊
         }␍␊
         $replacead1 = $this->makead(Pluf::f("google_ads")["AD1"]);␍␊
         $replacead2 = $this->makead(Pluf::f("google_ads")["AD2"]);␍␊
-        $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-->'));␍␊
+        $pos1 = strpos($response->content,'<!--AD1-->');␍␊
+        if ($pos1 !== false)␍␊
+            $response->content = substr_replace($response->content, $replacead1, $pos1, strlen('<!--AD1-->'));␍␊
+        $pos2 = strpos($response->content,'<!--AD2-->');␍␊
+        if ($pos2 !== false)␍␊
+            $response->content = substr_replace($response->content, $replacead2, $pos2, strlen('<!--AD2-->'));␍␊
         return $response;␍␊
     }␍␊
 ␍␊

Download the corresponding diff file

srchub

File differences

Branches