Changeset 387465
- Timestamp:
- 05/21/2011 05:54:18 PM (15 years ago)
- Location:
- wp-itheora/trunk/itheora/lib
- Files:
-
- 2 edited
-
ajax/alt_downloads.php (modified) (1 diff)
-
inc/play.php (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
wp-itheora/trunk/itheora/lib/ajax/alt_downloads.php
r387462 r387465 229 229 } 230 230 ?> 231 =======232 ?>233 >>>>>>> Initial commit of wp-itheora plugin -
wp-itheora/trunk/itheora/lib/inc/play.php
r387462 r387465 160 160 '; 161 161 } 162 <<<<<<< HEAD163 162 /** 164 163 * ereg is deprecated in php 5.3 use preg_match to fix it … … 167 166 */ 168 167 } else if(preg_match("/Safari/", getenv("HTTP_USER_AGENT"))) { // Si Safari,lecture par Java en premier parce qu'Apple impose la lecture via Quicktime meme s'il nest pas installe 169 =======170 } else if(ereg("Safari", getenv("HTTP_USER_AGENT"))) { // Si Safari,lecture par Java en premier parce qu'Apple impose la lecture via Quicktime meme s'il nest pas installe171 >>>>>>> Initial commit of wp-itheora plugin172 168 echo ' 173 169 <script type="text/javascript"><!-- … … 194 190 '; 195 191 } 196 <<<<<<< HEAD197 192 ?> 198 =======199 ?>200 >>>>>>> Initial commit of wp-itheora plugin
Note: See TracChangeset
for help on using the changeset viewer.