friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

more readable private image extraction for bypassing preg limits

This commit is contained in:
friendica 2011-11-27 13:44:45 -08:00
parent cf7568efd7
commit 1055ef3eea
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot.php
View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1177' ); define ( 'FRIENDICA_VERSION', '2.3.1178' );
define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
define ( 'DB_UPDATE_VERSION', 1105 ); define ( 'DB_UPDATE_VERSION', 1105 );

15
include/bbcode.php
View File

@ -36,16 +36,15 @@ function bbcode($Text,$preserve_nl = false) {
$saved_image = ''; $saved_image = '';
$img_start = strpos($Text,'[img]data:'); $img_start = strpos($Text,'[img]data:');
if($img_start !== false) { $img_end = strpos($Text,'[/img]');
if($img_start !== false && $img_end !== false && $img_end > $img_start) {
$start_fragment = substr($Text,0,$img_start); $start_fragment = substr($Text,0,$img_start);
$img_start += strlen('[img]'); $img_start += strlen('[img]');
$saved_image = substr($Text,$img_start); $saved_image = substr($Text,$img_start,strpos($Text,'[/img]'));
$img_end = strpos($saved_image,'[/img]'); $end_fragment = substr($Text,$img_end + strlen('[/img]'));
$saved_image = substr($saved_image,0,$img_end); // logger('saved_image: ' . $saved_image,LOGGER_DEBUG);
logger('saved_image: ' . $saved_image); $Text = $start_fragment . '[$#saved_image#$]' . $end_fragment;
$img_end += strlen('[/img]');
$Text = $start_fragment . '[$#saved_image#$]' . substr($Text,strlen($start_fragment) + strlen('[img]') + $img_end);
} }
// If we find any event code, turn it into an event. // If we find any event code, turn it into an event.