Changeset 27afd01c2ecf99ad422a195d1bf65d57e2385a04

Show
Ignore:
Timestamp:
03/09/12 14:23:49 (1 year ago)
Author:
Theo Schlossnagle <jesus@lethargy.org>
git-committer:
Theo Schlossnagle <jesus@lethargy.org> 1331303029 -0800
git-parent:

[42eb2c1c2706d6c086e6841479db964ed2d61504], [543cfd4366e59f3cdc4a1fd3e8efe8f6e8f6f790]

git-author:
Theo Schlossnagle <jesus@lethargy.org> 1331303029 -0800
Message:

Merge pull request #52 from brad-marshall/master

PHP warning and debian package fixes

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • pkg/debian/stratcon.install

    rca6785e r543cfd4  
    99usr/share/java/commons-io-1.2.jar 
    1010usr/share/java/commons-pool-1.4.jar 
    11 usr/share/java/esper-4.1.0.jar 
     11usr/share/java/esper-4.5.0.jar 
    1212usr/share/java/protobuf-java-2.4.1.jar 
    1313usr/share/java/postgresql-8.3-604.jdbc3.jar 

  • ui/web/htdocs/template_browse_json.php

    r263fbce r543cfd4  
    8080 
    8181                 foreach ($valid_sids[$sv] as $match) { 
    82                    if(!isset($target_sid_map[$match[target]])) { 
    83                      $target_sid_map[$match[target]] = array(); 
     82                   if(!isset($target_sid_map[$match['target']])) { 
     83                     $target_sid_map[$match['target']] = array(); 
    8484                   } 
    85                    $target_sid_map[$match[target]][] = $match[sid]; 
     85                   $target_sid_map[$match['target']][] = $match['sid']; 
    8686                 } 
    8787